From eb23b15acb15aae43b336ecf5ffb2053bcf85464 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 九月 2025 18:05:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
index d9a56c3..66df2ab 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -55,11 +56,11 @@
@ApiModelProperty(value = "采购价")
@TableField("purchase_price")
- private Double purchasePrice;
+ private BigDecimal purchasePrice;
@ApiModelProperty(value = "售价")
@TableField("sales_amount")
- private Double salesAmount;
+ private BigDecimal salesAmount;
@ApiModelProperty(value = "采购数量")
@TableField("purchase_count")
@@ -67,6 +68,10 @@
@ApiModelProperty(value = "总价")
@TableField("total_price")
- private Double totalPrice;
+ private BigDecimal totalPrice;
+
+ @ApiModelProperty(value = "供应商id")
+ @TableField("supplier_id")
+ private String supplierId;
}
--
Gitblit v1.7.1