Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

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

@@ -2,10 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.ToString;
@@ -26,7 +23,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn
     /**
      * 主键
      */
-    @TableId
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**

yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/salary/TSalaryStatisticsDepart.java

@@ -20,7 +20,7 @@ public class TSalaryStatisticsDepart implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
     /**
      * 部门名称

yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/salary/TSalaryStatisticsPersonal.java

@@ -20,7 +20,7 @@ public class TSalaryStatisticsPersonal implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
     /**
      * 电信工号

yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/system/TBusWarningEmployee.java

 package com.yifu.cloud.plus.v1.business.entity.system;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -29,7 +30,7 @@ public class TBusWarningEmployee extends Model<TBusWarningEmployee> {
      /**
       *
       */
-     @TableId
+     @TableId(type = IdType.ASSIGN_ID)
      @Schema(description = "主键", name = "id")
      private Integer id;
      /**

yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/vacation/TVacationRuleConfig.java

@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.business.entity.vacation;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,7 @@ public class TVacationRuleConfig extends Model<TVacationRuleConfig> {
     /**
      * 主键
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Integer id;
 
     /**

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

@@ -925,7 +925,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		if (Common.isNotNull(list)) {
 			TPaymentInfo paymentInfo;
 			TSocialFundInfo socialInfo;
-			TSocialInfo tSocialInfo = new TSocialInfo();
+			TSocialInfo tSocialInfo = null;
 			String temp;
 			int res;
 			List<TSocialInfo> socialist;
@@ -1560,7 +1560,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				String temp;
 				int res = -1;
 				List<TProvidentFund> fundlist;
-				TProvidentFund tProvidentFund = new TProvidentFund();
+				TProvidentFund tProvidentFund = null;
 				List<TSettleDomainSelectVo> settleDomainR;
 				R<TSettleDomainListVo> listVo;
 
@@ -2101,7 +2101,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		if (Common.isNotNull(list)) {
 			TPaymentInfo payExists;
 			TSocialFundInfo socialInfo = null;
-			TSocialInfo tSocialInfo = new TSocialInfo();
+			TSocialInfo tSocialInfo = null;
 			String temp;
 			List<TSocialInfo> socialist;
 			int res;