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

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

@@ -1815,9 +1815,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		EmpContractDispatchVo contract;
 		contract = new EmpContractDispatchVo();
 		contract.setContractEnd(excel.getContractEnd());
-		contract.setContractName(excel.getContractType());
+		contract.setContractName(excel.getContractName());
 		contract.setContractSubName(excel.getContractSubName());
-		contract.setContractType(excel.getContractName());
+		contract.setContractType(excel.getContractType());
 		contract.setContractStart(excel.getContractStart());
 		contract.setContractSubName(excel.getContractSubName());
 		contract.setDeptNo(excel.getSettleDomainCode());
@@ -1866,7 +1866,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		project.setCreateBy(user.getId());
 		project.setCreateName(user.getNickname());
 		project.setDeptNo(excel.getSettleDomainCode());
-		project.setContractType(excel.getContractType());
+		project.setContractType(excel.getContractName());
 		project.setEmpIdcard(excel.getEmpIdcard());
 		project.setEmpName(excel.getEmpName());
 		project.setEmpNatrue(excel.getEmpType());