修改表头

src/main/java/cn/redrock/assetmanage/dto/Material.java

@@ -17,29 +17,30 @@ import javax.validation.constraints.NotNull;
 public class Material {
     private Integer id;
     @ExcelColumn(value = "物料编号", col = 1)
+
     @NotBlank
     private String code;
+    @ExcelColumn(value = "数量", col = 2)
+
+    @NotNull
+    private Integer num;
 
-    @ExcelColumn(value = "物料数值", col = 3)
+    @ExcelColumn(value = "值", col = 3)
     @NotBlank
     private String value;
 
-    @ExcelColumn(value = "物料型号", col = 4)
+    @ExcelColumn(value = "型号", col = 4)
     @NotBlank
     private String modelNum;
 
-    @ExcelColumn(value = "物料封装", col = 5)
+    @ExcelColumn(value = "封装", col = 5)
     @NotBlank
     private String packages;
 
     @ExcelColumn(value = "公司名称", col = 6)
     private String company;
 
-    @ExcelColumn(value = "物料数量", col = 2)
+    @ExcelColumn(value = "位号", col = 7)
-    @NotNull
-    private Integer num;
-
-    @ExcelColumn(value = "物料位置", col = 7)
     @NotBlank
     private String position;
 

src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java

@@ -20,23 +20,23 @@ public class AmMaterial {
     @ExcelColumn(value = "物料编号", col = 1)
     private String code;
 
-    @ExcelColumn(value = "物料数值", col = 3)
+    @ExcelColumn(value = "数量", col = 2)
+    private Integer num;
+
+    @ExcelColumn(value = "值", col = 3)
     private String value;
 
-    @ExcelColumn(value = "物料型号", col = 4)
+    @ExcelColumn(value = "型号", col = 4)
     @Column(name = "model_num")
     private String modelNum;
 
-    @ExcelColumn(value = "物料封装", col = 5)
+    @ExcelColumn(value = "封装", col = 5)
     private String packages;
 
     @ExcelColumn(value = "公司名称", col = 6)
     private String company;
 
-    @ExcelColumn(value = "物料数量", col = 2)
+    @ExcelColumn(value = "位号", col = 7)
-    private Integer num;
-
-    @ExcelColumn(value = "物料位置", col = 7)
     private String position;
 
     @ExcelColumn(value = "备注", col = 8)