diff --git a/src/com/engine/salary/cmd/datacollection/AddUpDeductionListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpDeductionListCmd.java
index 9ffebccfc..4b651fa7d 100644
--- a/src/com/engine/salary/cmd/datacollection/AddUpDeductionListCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/AddUpDeductionListCmd.java
@@ -1,6 +1,5 @@
 package com.engine.salary.cmd.datacollection;
 
-import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.common.biz.AbstractCommonCommand;
 import com.engine.common.entity.BizLogContext;
@@ -12,7 +11,10 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.hrm.User;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class AddUpDeductionListCmd extends AbstractCommonCommand<Map<String, Object>> {
@@ -59,13 +61,6 @@ public class AddUpDeductionListCmd extends AbstractCommonCommand<Map<String, Obj
         table.setSqlprimarykey("t1.id");
         table.setSqlisdistinct("false");
 
-        //设置check是否可用
-        List<WeaTableCheckboxpopedom> checkboxpopedomList = new ArrayList<>();
-        WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom();
-        checkboxpopedom.setPopedompara("column:enable");
-        checkboxpopedomList.add(checkboxpopedom);
-        table.setCheckboxList(checkboxpopedomList);
-
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
         result.success();
diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java
index b32a4c6a2..810201b81 100644
--- a/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java
@@ -1,6 +1,5 @@
 package com.engine.salary.cmd.datacollection;
 
-import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.common.biz.AbstractCommonCommand;
 import com.engine.common.entity.BizLogContext;
@@ -12,7 +11,10 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.hrm.User;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class AddUpSituationListCmd extends AbstractCommonCommand<Map<String, Object>> {
@@ -71,13 +73,6 @@ public class AddUpSituationListCmd extends AbstractCommonCommand<Map<String, Obj
         table.setSqlprimarykey("t1.id");
         table.setSqlisdistinct("false");
 
-        //设置check是否可用
-        List<WeaTableCheckboxpopedom> checkboxpopedomList = new ArrayList<>();
-        WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom();
-        checkboxpopedom.setPopedompara("column:enable");
-        checkboxpopedomList.add(checkboxpopedom);
-        table.setCheckboxList(checkboxpopedomList);
-
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
         result.success();
diff --git a/src/com/engine/salary/cmd/datacollection/OtherDeductionListCmd.java b/src/com/engine/salary/cmd/datacollection/OtherDeductionListCmd.java
index 33dd7e334..7560b297b 100644
--- a/src/com/engine/salary/cmd/datacollection/OtherDeductionListCmd.java
+++ b/src/com/engine/salary/cmd/datacollection/OtherDeductionListCmd.java
@@ -1,6 +1,5 @@
 package com.engine.salary.cmd.datacollection;
 
-import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.common.biz.AbstractCommonCommand;
 import com.engine.common.entity.BizLogContext;
@@ -12,7 +11,10 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.hrm.User;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class OtherDeductionListCmd extends AbstractCommonCommand<Map<String, Object>> {
@@ -58,13 +60,6 @@ public class OtherDeductionListCmd extends AbstractCommonCommand<Map<String, Obj
         table.setSqlprimarykey("t1.id");
         table.setSqlisdistinct("false");
 
-        //设置check是否可用
-        List<WeaTableCheckboxpopedom> checkboxpopedomList = new ArrayList<>();
-        WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom();
-        checkboxpopedom.setPopedompara("column:enable");
-        checkboxpopedomList.add(checkboxpopedom);
-        table.setCheckboxList(checkboxpopedomList);
-
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
         result.success();
diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
index 4a3865d85..c61f434fc 100644
--- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
@@ -4,6 +4,7 @@ import com.engine.salary.annotation.SalaryTable;
 import com.engine.salary.annotation.SalaryTableColumn;
 import com.engine.salary.util.excel.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,7 +19,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 //数据采集-累计专项附加扣除记录
-@SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8")
+@SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8",tableType = WeaTableTypeEnum.CHECKBOX)
 public class AddUpDeductionRecordDTO {
 
     //主键id
diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
index 60d3f845f..6a91c9464 100644
--- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
@@ -6,6 +6,7 @@ import com.engine.salary.annotation.SalaryTableOperate;
 import com.engine.salary.util.excel.ExcelProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,7 +21,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@SalaryTable(pageId = "a4f85287-e3f9-7841-adn9-7d06e54y6rj8", operates = {
+@SalaryTable(pageId = "a4f85287-e3f9-7841-adn9-7d06e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX, operates = {
         @SalaryTableOperate(text = "查看明细")
 })
 public class AddUpSituationDTO {
diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
index a1933ec2e..7e26ad7f0 100644
--- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
@@ -1,8 +1,10 @@
 package com.engine.salary.entity.datacollection.dto;
 
+import com.engine.salary.annotation.SalaryTable;
 import com.engine.salary.annotation.SalaryTableColumn;
 import com.engine.salary.util.excel.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,6 +25,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@SalaryTable(pageId = "a5f85287-3354-4275-adn9-7d06e54y6rj8",tableType = WeaTableTypeEnum.CHECKBOX)
 public class AddUpSituationRecordDTO {
 
     @SalaryTableColumn(column = "id", display = false)
diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
index a67b85f27..4d59291b5 100644
--- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
@@ -3,12 +3,14 @@ package com.engine.salary.entity.datacollection.dto;
 import com.engine.salary.annotation.SalaryTable;
 import com.engine.salary.annotation.SalaryTableColumn;
 import com.engine.salary.annotation.SalaryTableOperate;
+import com.engine.salary.util.excel.ExcelProperty;
+import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * 数据采集-其他免税扣除列表
@@ -22,7 +24,7 @@ import java.time.LocalDate;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d06e54y6rj8", operates = {
+@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d06e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX, operates = {
         @SalaryTableOperate(text = "查看明细")
 })
 public class OtherDeductionListDTO {
@@ -38,45 +40,56 @@ public class OtherDeductionListDTO {
     //姓名
 
     @SalaryTableColumn(text = "姓名", width = "10%", column = "username")
+    @ExcelProperty(index = 0)
     private String username;
 
     //个税扣缴义务人
     @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName")
+    @ExcelProperty(index = 1)
     private String taxAgentName;
 
     //部门
     @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName")
+    @ExcelProperty(index = 2)
     private String departmentName;
 
     //手机号
     @SalaryTableColumn(text = "手机号", width = "10%", column = "mobile")
+    @ExcelProperty(index = 3)
     private String mobile;
 
     //工号
     @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum")
+    @ExcelProperty(index = 4)
     private String jobNum;
 
     //证件号码
     @SalaryTableColumn(text = "证件号码", width = "10%", column = "idNo")
+    @ExcelProperty(index = 5)
     private String idNo;
 
     //入职日期
+    @ExcelProperty(index = 6)
     @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate", transmethod = "com.engine.salary.transmethod.TransMethod.timeToDate")
-    private LocalDate hiredate;
+    private Date hiredate;
 
     //商业健康保险
+    @ExcelProperty(index = 7)
     @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "businessHealthyInsurance")
     private String businessHealthyInsurance;
 
     //税延养老保险
+    @ExcelProperty(index = 8)
     @SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDelayEndowmentInsurance")
     private String taxDelayEndowmentInsurance;
 
     //其他
+    @ExcelProperty(index = 9)
     @SalaryTableColumn(text = "其他", width = "10%", column = "otherDeduction")
     private String otherDeduction;
 
     //准予扣除的捐赠额
+    @ExcelProperty(index = 10)
     @SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "deductionAllowedDonation")
     private String deductionAllowedDonation;
 
diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
index f0d437c66..bf3c1bc24 100644
--- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
@@ -2,6 +2,7 @@ package com.engine.salary.entity.datacollection.dto;
 
 import com.engine.salary.annotation.SalaryTable;
 import com.engine.salary.annotation.SalaryTableColumn;
+import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,7 +22,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d98e54y6rj8")
+@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d98e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX)
 public class OtherDeductionRecordDTO {
 
     //主键id
diff --git a/src/com/engine/salary/init.sql b/src/com/engine/salary/init.sql
index 8d8ffdf4c..99fab444c 100644
--- a/src/com/engine/salary/init.sql
+++ b/src/com/engine/salary/init.sql
@@ -4,3 +4,5 @@ alter table  hrsa_tax_rate_base  modify id bigint auto_increment;
 alter table  hrsa_tax_rate_detail  modify id bigint auto_increment;
 alter table  hrsa_add_up_deduction  modify id bigint auto_increment;
 alter table  hrsa_add_up_situation  modify id bigint auto_increment;
+alter table  hrsa_other_deduction  modify id bigint auto_increment;
+