From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TErpGoodsExcel.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 2590d67..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 = "保养周期(天)")
@@ -42,12 +42,8 @@
@Excel(width = 30,name = "最低采购单位")
private String lowUnitName;
- @Excel(width = 30,name = "是否为处方药",replace = {"1_是","2_否"})
+ @Excel(width = 30,name = "是否为处方药")
private String isPrescriptionDrug;
-
- @ApiModelProperty(value = "商品规格")
- @TableField("goods_spec")
- private String goodsSpec;
@Excel(width = 30,name = "*预警库存")
--
Gitblit v1.7.1