From 14f55cd77189bae10627277a2a3dab9cec5fcada Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 十月 2025 18:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java
index ff6fc60..ffd4593 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysGoods.java
@@ -8,6 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -61,4 +62,19 @@
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "供应商id")
+    @TableField("supplier_id")
+    private String supplierId;
+
+
+    // 剩余数量
+    @ApiModelProperty(value = "剩余数量")
+    @TableField(exist = false)
+    private Integer surplusQuantity;
+
+    // 已兑换数量
+
+    @ApiModelProperty(value = "已兑换数量")
+    @TableField(exist = false)
+    private Integer exchangeQuantity;
 }

--
Gitblit v1.7.1