hfxc226 2 anni fa
parent
commit
6352b30b92

+ 10 - 56
platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -28,12 +28,12 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 设备编号
      */
-    @Excel(name = "设备(新号)", orderNum = "2")
+    @Excel(name = "设备编号", orderNum = "2")
     private String no;
     /**
      * 设备编号
      */
-    @Excel(name = "设备(旧号)", orderNum = "3")
+    @Excel(name = "设备自编号", orderNum = "3")
     private String zbh;
     /**
      * 设备名称
@@ -71,9 +71,9 @@ public class ExportSbInfoVO implements Serializable {
     @Excel(name = "大小/尺寸", orderNum = "10")
     private String zz;
     /**
-     * 使用位置
+     * 设备位置
      */
-    @Excel(name = "使用位置", orderNum = "11")
+    @Excel(name = "设备位置", orderNum = "11")
     private String cph;
     /**
      * 使用位置
@@ -90,81 +90,35 @@ public class ExportSbInfoVO implements Serializable {
      */
     @Excel(name = "使用机台/使用人", orderNum = "14")
     private String saveUserName;
-    /**
-     * 维修人
-     */
-    @Excel(name = "维修人", orderNum = "15")
-    private String repairUserName;
-    /**
-     * 第二维修人
-     */
-    @Excel(name = "第二维修人", orderNum = "16")
-    private String repairUserNameSecond;
     /**
      * 购置日期
      */
-    @Excel(name = "购置日期", orderNum = "17")
+    @Excel(name = "购置日期", orderNum = "15")
     private LocalDate buyDate;
     /**
      * 投用日期
      */
-    @Excel(name = "投用日期", orderNum = "18")
+    @Excel(name = "投用日期", orderNum = "16")
     private LocalDate startDate;
-
     /**
      * 状态
      */
-    @Excel(name = "状态", orderNum = "19", dicCode="SB_INFO_STATUS")
+    @Excel(name = "状态", orderNum = "17", dicCode="SB_INFO_STATUS")
     private Integer status;
     /**
      * 备注
      */
-    @Excel(name = "备注", orderNum = "20")
+    @Excel(name = "备注", orderNum = "18")
     private String remark;
     /**
      * 是否子设备
      */
-    @Excel(name = "是否子设备", orderNum = "21", dicCode="SB_IS_CHILD")
+    @Excel(name = "是否子设备", orderNum = "19", dicCode="SB_IS_CHILD")
     private Integer isChild;
-    /**
-     * 是否大屏显示
-     */
-    @Excel(name = "是否大屏显示", orderNum = "22", dicCode="SB_IS_SHOW")
-    private Integer isShow;
-    /**
-     * 存放位置和所属车间是同一个
-     */
-    @Excel(name = "所属车间", orderNum = "23")
-    private String positionName;
     /**
      * 财务编码/固定资产编号
      */
-    @Excel(name = "财务编码1", orderNum = "24")
+    @Excel(name = "财务编码", orderNum = "20")
     private String financingNo;
-    /**
-     * 财务编码/固定资产编号
-     */
-    @Excel(name = "财务编码2", orderNum = "25")
-    private String financingNoTwo;
-    /**
-     * 财务编码/固定资产编号
-     */
-    @Excel(name = "财务编码3", orderNum = "26")
-    private String financingNoThird;
-    /**
-     * 财务编码/固定资产编号
-     */
-    @Excel(name = "财务编码4", orderNum = "27")
-    private String financingNoFour;
-    /**
-     * 财务编码5
-     */
-    @Excel(name = "财务编码5", orderNum = "28")
-    private String financingNoFive;
-    /**
-     * 自定义参数
-     */
-    @Excel(name = "自定义参数", orderNum = "29")
-    private String paramList;
 
 }