From d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 十月 2025 18:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 be288da..81be1c8 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;
/**
@@ -55,6 +56,18 @@
@ApiModelProperty(value = "售价")
@TableField("sale_amount")
- private Double saleAmount;
+ 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