From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java b/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java
index 1588fd8..e2afe93 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/excel/FeStandardSubstanceImport.java
@@ -14,7 +14,7 @@
@ExcelProperty("瑙勬牸鍨嬪彿*")
private String model;
- @ExcelProperty("鐢熶骇鍘傚*")
+ @ExcelProperty("鐢熶骇鍘傚")
private String factoryManufacturer;
@ExcelProperty("鍑哄巶缂栧彿*")
@@ -29,6 +29,9 @@
@ExcelProperty("鏁伴噺*")
private String quantity;
+ @ExcelProperty("鍗曚綅")
+ private String unit;
+
@ExcelProperty("璐疆鏃ユ湡*(yyyy-MM-dd)")
private String acquisitionDate;
--
Gitblit v1.9.3