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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -144,9 +144,9 @@ public class TEmployeeProject extends BaseEntity {
     private Integer isLeaveEmployee;
 
 	/**
-	 * 已产生未结算费用 0：划转 1：不划转
+	 * 已产生未结算费用 0：不划转 1：划转
 	 */
-	@Schema(description ="已产生未结算费用（0：划转 1：不划转）")
+	@Schema(description ="已产生未结算费用（0：不划转 1：划转）")
 	@TableField(exist = false)
 	private String unsettleDeal;
 

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

@@ -227,7 +227,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 							updateTEmployeePro.setUnitName(tCustomerInfo.getCustomerName());
 						}
 						updateTEmployeePro.setChangeStartMonth(excel.getChangeStartMonth());
-						updateTEmployeePro.setUnsettleDeal(CommonConstants.ONE_STRING);
+						updateTEmployeePro.setUnsettleDeal(CommonConstants.IS_NO_CHANGE);
 						updateList.add(updateTEmployeePro);
 						// 记录变更日志
 						tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProjectOld.getId(), tEmployeeProjectOld, updateTEmployeePro);

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -392,7 +392,7 @@ public interface CommonConstants {
 	// 是否
 	String IS_CHANGE = "划转";
 
-	String IS_NO_CHANGE = "划转";
+	String IS_NO_CHANGE = "不划转";
 
 	// 年
 	String YEAR = "年";