From a122cfc45d18b6e679029a88eb342e9081df6595 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 12 五月 2026 09:14:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index f0e9470..9cba3fe 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -79,4 +79,11 @@
@Schema(description = "椤堕儴鐖朵骇鍝乮d")
@TableField(exist = false)
private Long topProductParentId;
+
+ /**
+ * 搴撳瓨閲�
+ */
+ @Schema(description = "搴撳瓨閲�")
+ @Excel(name = "搴撳瓨閲�")
+ private BigDecimal stockInventory;
}
--
Gitblit v1.9.3