完善默认值

src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java

@@ -23,7 +23,7 @@ public class CoalAnalysisEntity extends OrgCommonEntity {
 
     @Comment("归档状态")
     @ColumnDefault("'0'")
-    private String archiveStatus;
+    private String archiveStatus = "0";
 
     @Formula(
             "(select i.name\n"

src/main/java/cn/lihongjie/coal/coalAnalysisHis/entity/CoalAnalysisHisEntity.java

@@ -23,7 +23,7 @@ public class CoalAnalysisHisEntity extends OrgCommonEntity {
 
     @Comment("归档状态")
     @ColumnDefault("'0'")
-    private String archiveStatus;
+    private String archiveStatus = "0";
 
     @ManyToOne
     @Comment("关联化验数据")

src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
 
     @Comment("归档状态")
-    private String archiveStatus;
+    private String archiveStatus = "0";
 
     @Formula(
             "(select i.name\n"

src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java

@@ -84,7 +84,7 @@ public class EmpSalaryEntity extends OrgCommonEntity {
 
     @Comment("归档状态")
     @ColumnDefault("'0'")
-    private String archiveStatus;
+    private String archiveStatus = "0";
 
     @Formula(
             "(select i.name\n"

src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java

@@ -24,7 +24,7 @@ public class EmpSalaryBatchEntity extends OrgCommonEntity {
 
     @Comment("归档状态")
     @ColumnDefault("'0'")
-    private String archiveStatus;
+    private String archiveStatus = "0";
 
     @Formula(
             "(select i.name\n"

src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java

@@ -48,7 +48,7 @@ public class EmployeeRecordEntity extends OrgCommonEntity {
 
     @Comment("归档状态")
     @ColumnDefault("'0'")
-    private String archiveStatus;
+    private String archiveStatus = "0";
 
     @Formula(
             "(select i.name\n"

src/main/resources/config/dictionary.json

@@ -1984,6 +1984,26 @@
 
     ]
   },
+
+  {
+    "code": "emp.salary.item.config.type",
+    "name": "工资公式项目配置信息",
+    "item": [
+      {
+        "code": "0",
+        "name": "人员字段"
+      },
+      {
+        "code": "1",
+        "name": "工资字段"
+      },
+      {
+        "code": "2",
+        "name": "其他"
+      }
+
+    ]
+  },
   {
     "code": "emp.record.type",
     "name": "员工档案记录类型",