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

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

@@ -4111,6 +4111,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    t.setDate(time.getDate());
                    t.setTimeInterval(time.getTimeInterval());
                    t.setSourceNumber(time.getSourceNumber());
                    t.setCreateUser(time.getCreateUser());
                    t.setCreateUserType(time.getCreateUserType());
                    rs.add(t);
                }
                logger.info(rs.size()+"");

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/doctor/WlyyDoctorWorkTimeDO.java

@@ -32,6 +32,8 @@ public class WlyyDoctorWorkTimeDO extends UuidIdentityEntity {
    private Integer timeInterval;//号源间隔
    private Integer sourceNumber;//号源数目
    private Date createTime;//创建时间',
    private String createUser;//创建人
    private Integer createUserType;//创建人类型1医院2医生
    public String getDoctor() {
        return doctor;
@@ -173,4 +175,20 @@ public class WlyyDoctorWorkTimeDO extends UuidIdentityEntity {
    public void setDate(String date) {
        this.date = date;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public Integer getCreateUserType() {
        return createUserType;
    }
    public void setCreateUserType(Integer createUserType) {
        this.createUserType = createUserType;
    }
}