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

@@ -137,6 +137,7 @@ public class BaseDoctorHospitalDO extends IntegerIdentityEntity {
        this.doctorDutyName = doctorDutyName;
    }
    @Transient
    public String getWinNo() {
        return winNo;
    }