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/vo/TErpGoodsInventoryVO.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
index bc1d288..88ca654 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(value = "国药准字号")
     private String quasiNumber;
 
-    @ApiModelProperty(value = "商品标识码")
+    @ApiModelProperty(value = "商品条码")
     private String goodsIdCode;
 
     @ApiModelProperty(value = "批次号")
@@ -58,4 +58,10 @@
     private LocalDateTime expiryDate;
 
 
+    private Integer goodsSource;
+
+    @ApiModelProperty(value = "供应商id")
+    private String supplierId;
+
+
 }

--
Gitblit v1.7.1