Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java

@@ -64,7 +64,7 @@ public class EmpContractDispatchVo implements Serializable {
 	/**
 	 * 员工类型
 	 */
-	@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
+	@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
 	@TableField(exist = false)
 	private String empNatrue;
 	/**

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml

@@ -198,7 +198,7 @@
 		a.AUDIT_TIME_LAST,
 		a.TYPE,
 		a.LEAVE_DATE,
-		a.REDUCE_REASON
+		a.REDUCE_REASON,a.type
 
 	</sql>