From 8e8f1bd4d6290f8c4bf4d98a1b282b01f706e10b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 16 十月 2025 13:56:53 +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/model/TSysOrderGoods.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java
index 676b856..50a09ea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java
@@ -8,6 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -32,6 +33,9 @@
     @ApiModelProperty(value = "订单id")
     @TableField("order_id")
     private String orderId;
+    @ApiModelProperty(value = "商品id")
+    @TableField("goods_id")
+    private String goodsId;
 
     @ApiModelProperty(value = "商品名称")
     @TableField("goods_name")
@@ -57,4 +61,16 @@
     @TableField("sale_amount")
     private BigDecimal saleAmount;
 
+    @ApiModelProperty(value = "批次id")
+    @TableField("batch_id")
+    private String batchId;
+
+    @ApiModelProperty(value = "批次号")
+    @TableField("batch_number")
+    private String batchNumber;
+
+    @ApiModelProperty(value = "剩于数量")
+    @TableField("remaining_quantity")
+    private Integer remainingQuantity;
+
 }

--
Gitblit v1.7.1