From 93464498152c99e601c89813267e19022b771184 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 28 三月 2026 15:26:59 +0800
Subject: [PATCH] Merge branch 'hxsj_bhz0328' into hxsj
---
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
index 08c9d21..9d8091d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
@@ -8,6 +8,8 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -18,7 +20,7 @@
@Data
@TableName("procurement_price_management")
@ApiModel
-public class ProcurementPriceManagement {
+public class ProcurementPriceManagement implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -31,8 +33,14 @@
@Excel(name = "鍟嗗搧鍚嶇О")
private String productName;
+ @TableField(value = "product_id")
+ private Long productId;
+
+ /**
+ * 鏃犳晥瀛楁 鍙互浣滀负鍐椾綑瀛楁浣跨敤
+ */
@ApiModelProperty(value = "鍟嗗搧缂栫爜")
- @Excel(name = "鍟嗗搧缂栫爜")
+// @Excel(name = "鍟嗗搧缂栫爜")
private String productCode;
@ApiModelProperty(value = "瑙勬牸鍨嬪彿")
@@ -43,9 +51,17 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+ @TableField(value = "supplier_id")
+ private Long supplierId;
+
@ApiModelProperty(value = "鍩虹浠锋牸")
@Excel(name = "鍩虹浠锋牸")
private String basePrice;
+
+ @ApiModelProperty(value = "瀹為檯浠锋牸")
+ @TableField(value = "actually_price")
+ @Excel
+ private BigDecimal actuallyPrice;
@ApiModelProperty(value = "鐘舵��")
@TableField(exist = false)
@@ -76,6 +92,8 @@
@Excel(name = "鏈�楂樹环鏍�")
private String maxPrice;
+
+
@ApiModelProperty(value = "棰勮闃堝��(%)")
private String warningThreshold;
--
Gitblit v1.9.3