diff --git a/src/main/java/cn/redrock/assetmanage/dto/Material.java b/src/main/java/cn/redrock/assetmanage/dto/Material.java index a928f0b..b0f175a 100644 --- a/src/main/java/cn/redrock/assetmanage/dto/Material.java +++ b/src/main/java/cn/redrock/assetmanage/dto/Material.java @@ -37,13 +37,13 @@ public class Material { @NotBlank private String packages; - @ExcelColumn(value = "公司名称", col = 6) - private String company; - - @ExcelColumn(value = "位号", col = 7) + @ExcelColumn(value = "位号", col = 6) @NotBlank private String position; + @ExcelColumn(value = "公司名称", col = 7) + private String company; + @ExcelColumn(value = "备注", col = 8) private String description; diff --git a/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java b/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java index e79943e..13aca01 100644 --- a/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java +++ b/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java @@ -33,12 +33,12 @@ public class AmMaterial { @ExcelColumn(value = "封装", col = 5) private String packages; - @ExcelColumn(value = "公司名称", col = 6) - private String company; - - @ExcelColumn(value = "位号", col = 7) + @ExcelColumn(value = "位号", col = 6) private String position; + @ExcelColumn(value = "公司名称", col = 7) + private String company; + @ExcelColumn(value = "备注", col = 8) private String description; diff --git a/src/main/resources/static/template.xlsx b/src/main/resources/static/template.xlsx index 2b46206..fedea1f 100644 Binary files a/src/main/resources/static/template.xlsx and b/src/main/resources/static/template.xlsx differ