From 7466c73393e53f01c35b2ee429f943737199845a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 12 Sep 2024 09:13:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?EBOM-=E5=AF=BC=E5=85=A5=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/pojo/dto/BomNewEBomImportExcelDTO.java | 3 +++
 1 file changed, 3 insertions(+)

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 c3332bf1..28b583bf 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
@@ -38,6 +38,9 @@ public class BomNewEBomImportExcelDTO {
     @ExcelColumn(value = "数量*")
     private BigDecimal num;
 
+    @ExcelColumn(value = "单位")
+    private BigDecimal materialOriginalUnit;
+
 
 
     @ExcelColumn(value = "材质")

From cbf7dedf55aeb0f1af1ae116dcf57024355d97c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 12 Sep 2024 09:51:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?EBOM-=E5=AF=BC=E5=85=A5=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/pojo/dto/BomNewEBomImportExcelDTO.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 28b583bf..f9ee235f 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
@@ -39,7 +39,7 @@ public class BomNewEBomImportExcelDTO {
     private BigDecimal num;
 
     @ExcelColumn(value = "单位")
-    private BigDecimal materialOriginalUnit;
+    private String materialOriginalUnit;