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

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

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1849,7 +1849,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			contract.setEmpId(empVo.getId());
 			contract.setEmpNo(empVo.getEmpNo());
 			if (Common.isNotNull(empVo.getEmpNatrue())){
-				contract.setEmpType(empVo.getEmpNatrue());
+				contract.setEmpNatrue(empVo.getEmpNatrue());
 			}
 			contract.setFileProvince(empVo.getFileProvince());
 			contract.setFileCity(empVo.getFileCity());