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

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

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorHospitalDO.java

@@ -54,7 +54,6 @@ public class BaseDoctorHospitalDO extends IntegerIdentityEntity {
    /**
     * 所在院部机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾，眼科（0思北1五缘湾）
     */
    @Transient
    private String winNo;
    /**