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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -932,7 +932,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		YifuUser user = SecurityUtils.getUser();
 		insTEmployeePro.setCreateBy(user.getId());
 		insTEmployeePro.setCreateName(user.getNickname());
-		insTEmployeePro.setProjectSource(CommonConstants.dingleDigitStrArray[5]);
+		insTEmployeePro.setProjectSource(CommonConstants.dingleDigitStrArray[6]);
 		proInsList.add(insTEmployeePro);
 	}
 

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

@@ -622,7 +622,7 @@
 		insert into t_employee_project
 		(ID,EMP_ID,EMP_NATRUE,EMP_NAME,EMP_IDCARD,STATUS,PROJECT_STATUS,EMP_CODE,DEPT_NO,CONTRACT_TYPE,POST,
 		DEPT_ID,DEPT_NAME,UNIT_ID,UNIT_NAME,UNIT_NO,EMP_NO,TRY_PERIOD,ENJOIN_DATE,BANK_NAME,BANK_NO,BANK_SUB_NAME,
-		WORKING_HOURS,DELETE_FLAG,CREATE_BY,CREATE_NAME,CREATE_TIME,INSURANCE_STATUS,SOCIAL_STATUS,FUND_STATUS)
+		WORKING_HOURS,PROJECT_SOURCE,DELETE_FLAG,CREATE_BY,CREATE_NAME,CREATE_TIME,INSURANCE_STATUS,SOCIAL_STATUS,FUND_STATUS)
 		VALUES
 		<foreach collection="list" item="item" index="index" separator=",">
 			(
@@ -649,6 +649,7 @@
 			#{item.bankNo,jdbcType=VARCHAR},
 			#{item.bankSubName,jdbcType=VARCHAR},
 			#{item.workingHours,jdbcType=VARCHAR},
+			#{item.projectSource,jdbcType=VARCHAR},
 			#{item.deleteFlag,jdbcType=VARCHAR},
 			#{item.createBy,jdbcType=VARCHAR},
 			#{item.createName,jdbcType=VARCHAR},