diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java
index 50e9d8d2..440c958d 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java
@@ -41,10 +41,6 @@ public class EmployeesApplyMQDto implements Serializable {
private String height;
/**体重*/
private String weight;
- /**家庭住址*/
- private String address;
- /**是否吸烟*/
- private String isSmoking;
/**健康状况*/
private String healthStatus;
/**户籍所在地*/
@@ -67,12 +63,8 @@ public class EmployeesApplyMQDto implements Serializable {
private String idCardNegative;
/**健康证正面*/
private String healthCertificatePositive;
- /**健康证反面*/
- private String healthCertificateNegative;
/**银行卡正面*/
private String bankPositive;
- /**银行卡反面*/
- private String bankNegative;
/**开户行*/
private String openingBank;
/**银行卡号*/
@@ -81,8 +73,6 @@ public class EmployeesApplyMQDto implements Serializable {
private String qualification;
/**无犯罪证明*/
private String noCrimeCertificate;
- /**区域*/
- private String regional;
/**是否删除 0未删除 1删除*/
private String delFlag;
/**申请日期*/
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesInfoEntity.java
index 795d503f..1770f364 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesInfoEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesInfoEntity.java
@@ -45,8 +45,6 @@ public class EmployeesInfoEntity implements Serializable {
private Date dateOfBirth;
/**婚否*/
private String marriedOrNot;
- /**工资*/
- private String wages;
/**身高*/
private String height;
/**体重*/
@@ -57,8 +55,6 @@ public class EmployeesInfoEntity implements Serializable {
* 现住址
*/
private String currentAddress;
- /**是否吸烟*/
- private String isSmoking;
/**健康状况*/
private String healthStatus;
/**户籍所在地*/
@@ -79,18 +75,10 @@ public class EmployeesInfoEntity implements Serializable {
private String idCardPositive;
/**身份证反面*/
private String idCardNegative;
- /**合同正面*/
- private String contractPositive;
- /**合同反面*/
- private String contractNegative;
/**健康证正面*/
private String healthCertificatePositive;
- /**健康证反面*/
- private String healthCertificateNegative;
/**银行卡正面*/
private String bankPositive;
- /**银行卡反面*/
- private String bankNegative;
/**开户行*/
private String openingBank;
/**银行卡号*/
@@ -99,10 +87,6 @@ public class EmployeesInfoEntity implements Serializable {
private String qualification;
/**无犯罪证明*/
private String noCrimeCertificate;
- /**区域*/
- private String regional;
- /**服务标签*/
- private String serviceTag;
/**创建人*/
private String createBy;
diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java
index fe9934f8..03228093 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java
@@ -79,10 +79,6 @@ public class BizEmployeesInfo implements Serializable {
@Excel(name = "婚否", width = 15, dicCode = "married_or_not")
@ApiModelProperty(value = "婚否")
private java.lang.String marriedOrNot;
- /**工资*/
- @Excel(name = "工资", width = 15, dicCode = "wages")
- @ApiModelProperty(value = "工资")
- private java.lang.String wages;
/**身高*/
@Excel(name = "身高", width = 15)
@ApiModelProperty(value = "身高")
@@ -101,10 +97,6 @@ public class BizEmployeesInfo implements Serializable {
@Excel(name = "现住址", width = 15)
@ApiModelProperty(value = "现住址")
private String currentAddress;
- /**是否吸烟*/
- @Excel(name = "是否吸烟", width = 15, dicCode = "is_smoking")
- @ApiModelProperty(value = "是否吸烟")
- private java.lang.String isSmoking;
/**健康状况*/
@Excel(name = "健康状况", width = 15, dicCode = "health_status")
@ApiModelProperty(value = "健康状况")
@@ -145,30 +137,14 @@ public class BizEmployeesInfo implements Serializable {
@Excel(name = "身份证反面", width = 15)
@ApiModelProperty(value = "身份证反面")
private java.lang.String idCardNegative;
- /**合同正面*/
- @Excel(name = "合同正面", width = 15)
- @ApiModelProperty(value = "合同正面")
- private java.lang.String contractPositive;
- /**合同反面*/
- @Excel(name = "合同反面", width = 15)
- @ApiModelProperty(value = "合同反面")
- private java.lang.String contractNegative;
/**健康证正面*/
@Excel(name = "健康证正面", width = 15)
@ApiModelProperty(value = "健康证正面")
private java.lang.String healthCertificatePositive;
- /**健康证反面*/
- @Excel(name = "健康证反面", width = 15)
- @ApiModelProperty(value = "健康证反面")
- private java.lang.String healthCertificateNegative;
/**银行卡正面*/
@Excel(name = "银行卡正面", width = 15)
@ApiModelProperty(value = "银行卡正面")
private java.lang.String bankPositive;
- /**银行卡反面*/
- @Excel(name = "银行卡反面", width = 15)
- @ApiModelProperty(value = "银行卡反面")
- private java.lang.String bankNegative;
/**开户行*/
@Excel(name = "开户行", width = 15)
@ApiModelProperty(value = "开户行")
@@ -185,14 +161,6 @@ public class BizEmployeesInfo implements Serializable {
@Excel(name = "无犯罪证明", width = 15)
@ApiModelProperty(value = "无犯罪证明")
private java.lang.String noCrimeCertificate;
- /**区域*/
- @Excel(name = "区域", width = 15)
- @ApiModelProperty(value = "区域")
- private java.lang.String regional;
- /**服务标签*/
- @Excel(name = "服务标签", width = 15)
- @ApiModelProperty(value = "服务标签")
- private java.lang.String serviceTag;
/**创建人*/
@ApiModelProperty(value = "创建人")
diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml
index d71ef635..90fdcef6 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/BizEmployeesInfoMapper.xml
@@ -8,118 +8,14 @@