From 0cc92828383014e38b770427353d09f693c5ee9d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 27 四月 2026 13:26:16 +0800
Subject: [PATCH] fix(sales): 修复销售台账产品查询中供应商名称搜索条件重复问题

---
 src/main/java/com/ruoyi/basic/pojo/ProductModel.java |   19 ++++++++++++++-----
 1 files changed, 14 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 cb93426..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)
@@ -63,6 +59,7 @@
 
     @TableField(exist = false)
     private LocalDateTime createTime;
+
     @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
@@ -70,4 +67,16 @@
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
 
+    @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