From ac7a5e454ea1ae153fddf4973b080be1a7a933a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sat, 25 May 2024 17:50:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E5=AF=BC=E5=85=A5=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C*=E2=80=9D=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/pojo/dto/BomNewEBomImportExcelDTO.java   | 5 ++---
 .../java/com/nflg/product/bomnew/pojo/dto/EbomExcelDTO.java | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomImportExcelDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomImportExcelDTO.java
index e685a25a..c3332bf1 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomImportExcelDTO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewEBomImportExcelDTO.java
@@ -1,7 +1,6 @@
 package com.nflg.product.bomnew.pojo.dto;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +23,7 @@ public class BomNewEBomImportExcelDTO {
     private String projectType;
 
 
-    @ExcelColumn(value = "物料编码")
+    @ExcelColumn(value = "物料编码*")
     private String materialNo;
 
 
@@ -36,7 +35,7 @@ public class BomNewEBomImportExcelDTO {
     private String materialDesc;
 
 
-    @ExcelColumn(value = "数量")
+    @ExcelColumn(value = "数量*")
     private BigDecimal num;
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomExcelDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomExcelDTO.java
index 35eb6479..080e5cd3 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomExcelDTO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EbomExcelDTO.java
@@ -15,7 +15,7 @@ public class EbomExcelDTO extends BaseImportExcelDTO {
     /**
      * 父级物料编号
      */
-    @ExcelColumn("抬头物料")
+    @ExcelColumn("抬头物料*")
     private String parentMaterialNo;
 
     /**
@@ -33,7 +33,7 @@ public class EbomExcelDTO extends BaseImportExcelDTO {
     /**
      * 物料编号
      */
-    @ExcelColumn("项目物料")
+    @ExcelColumn("项目物料*")
     private String materialNo;
 
     /**
@@ -45,7 +45,7 @@ public class EbomExcelDTO extends BaseImportExcelDTO {
     /**
      * 数量
      */
-    @ExcelColumn("数量")
+    @ExcelColumn("数量*")
     private BigDecimal num;
 
     /**