From 66e1a2c0f36b2b8612597315269cca1570d56208 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Mon, 29 Jan 2024 22:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/pojo/vo/MaterialMateVO.java        | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java
index d345fa96..974ad4d2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/MaterialMateVO.java
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.ttzero.excel.annotation.ExcelColumn;
+
 import java.time.LocalDateTime;
 import java.time.LocalDate;
 
@@ -20,28 +22,23 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @ApiModel(value="com-nflg-product-bomnew-pojo-mate-vo-MaterialMateEntityVO")
 public class MaterialMateVO implements Serializable {
-            
 
-    /**
-     * 物料编码
-     */
-    @ApiModelProperty(value = "物料编码")
+
+    private Long rowId;
+    //物料编码
+    @ExcelColumn("物料编号")
     private String materialNo;
-        
-    /**
-     * 物料名称
-     */
-    @ApiModelProperty(value = "物料名称")
+    //物料名称
+    @ExcelColumn("图纸名称包含")
     private String materialName;
-        
-    /**
-     * 材质
-     */
-    @ApiModelProperty(value = "材质")
+    //材质
+    @ExcelColumn("图纸材质")
     private String materialTexture;
-
-    @ApiModelProperty("物料描述")
+    //物料描述
+    @ExcelColumn("物料描述")
     private String materialDesc;
+
+    private Boolean checked = false;