From 283ea8cfd97f225d0451d57bf915e6f3a0f2041b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 28 九月 2025 19:03:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TErpGoodsExcel.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TErpGoodsExcel.java b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TErpGoodsExcel.java
index 39b3bf4..5377c5b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TErpGoodsExcel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TErpGoodsExcel.java
@@ -14,7 +14,7 @@
     @Excel(width = 30,name = "*商品名称")
     private String goodsName;
 
-    @Excel(width = 30,name = "*商品标识码")
+    @Excel(width = 30,name = "*商品条码")
     private String goodsIdCode;
 
     @Excel(width = 30,name = "*国药准字号")
@@ -30,7 +30,7 @@
     private String packingSpec;
 
 
-    @Excel(width = 30,name = "商品69码")
+    @Excel(width = 30,name = "商品标识码")
     private String goodsYards;
 
     @Excel(width = 30,name = "保养周期(天)")

--
Gitblit v1.7.1