1、优化工资类

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/entity/SalaryImport.java

@@ -2,6 +2,8 @@ package com.zjugis.module.business.flow.salary.entity;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDateTime;
@@ -28,6 +30,7 @@ public class SalaryImport extends BaseEntity {
     /**
      * 工资导入记录的唯一标识
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -55,50 +58,5 @@ public class SalaryImport extends BaseEntity {
      */
     private String instanceId;
 
-    /**
-     * 创建人
-     */
-    private String createWorker;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 最后修改人
-     */
-    private String latestModifyWorker;
-
-    /**
-     * 最后修改时间
-     */
-    private LocalDateTime latestModifyTime;
-
-    /**
-     * 是否合法
-     */
-    private BigDecimal isvalid;
-
-    /**
-     * 备注1
-     */
-    private String bz1;
-
-    /**
-     * 备注2
-     */
-    private String bz2;
-
-    /**
-     * 备注3
-     */
-    private String bz3;
-
-    /**
-     * 备注4
-     */
-    private String bz4;
-
 
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/entity/SalaryInfo.java

@@ -2,6 +2,8 @@ package com.zjugis.module.business.flow.salary.entity;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDateTime;
@@ -31,6 +33,7 @@ public class SalaryInfo extends BaseEntity {
     /**
      * 工资信息记录的唯一标识
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -114,51 +117,6 @@ public class SalaryInfo extends BaseEntity {
      */
     private String instanceId;
 
-    /**
-     * 创建人
-     */
-    private String createWorker;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 最后修改人
-     */
-    private String latestModifyWorker;
-
-    /**
-     * 最后修改时间
-     */
-    private LocalDateTime latestModifyTime;
-
-    /**
-     * 是否合法
-     */
-    private BigDecimal isvalid;
-
-    /**
-     * 备注1
-     */
-    private String bz1;
-
-    /**
-     * 备注2
-     */
-    private String bz2;
-
-    /**
-     * 备注3
-     */
-    private String bz3;
-
-    /**
-     * 备注4
-     */
-    private String bz4;
-
     /**
      * 扩展字段 1
      */

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/entity/SalaryInfoSettings.java

@@ -2,6 +2,8 @@ package com.zjugis.module.business.flow.salary.entity;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDateTime;
@@ -28,6 +30,7 @@ public class SalaryInfoSettings extends BaseEntity {
     /**
      * 工资信息设置记录的唯一标识
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -55,50 +58,4 @@ public class SalaryInfoSettings extends BaseEntity {
      */
     private Integer sortOrder;
 
-    /**
-     * 创建人
-     */
-    private String createWorker;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 最后修改人
-     */
-    private String latestModifyWorker;
-
-    /**
-     * 最后修改时间
-     */
-    private LocalDateTime latestModifyTime;
-
-    /**
-     * 是否合法
-     */
-    private BigDecimal isvalid;
-
-    /**
-     * 备注1
-     */
-    private String bz1;
-
-    /**
-     * 备注2
-     */
-    private String bz2;
-
-    /**
-     * 备注3
-     */
-    private String bz3;
-
-    /**
-     * 备注4
-     */
-    private String bz4;
-
-
 }