Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -9354,7 +9354,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                return "找不到医生信息！";
            }
        }
        return null;
    }
}