From 30ef534fcffe0520bebe7a34abe69d7afbbf227f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 13 八月 2026 13:53:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_西宁_湟水峡' into dev_西宁_湟水峡
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index e449263..3256d5b 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -42,11 +42,7 @@
@Excel(name = "鍗曚綅")
private String unit;
- /**
- * 鐢熶骇鐐掓満
- */
- @Excel(name = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
@@ -74,4 +70,13 @@
@ApiModelProperty("椤堕儴鐖朵骇鍝乮d")
@TableField(exist = false)
private Long topProductParentId;
+
+
+ @ApiModelProperty(value = "鍗曚环")
+ @Excel(name = "鍗曚环")
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "搴撳瓨棰勮鍊�")
+ @Excel(name = "搴撳瓨棰勮鍊�")
+ private BigDecimal stockWarningValue;
}
--
Gitblit v1.9.3