From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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..485e144 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,8 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -55,11 +57,11 @@
@ApiModelProperty(value = "采购价")
@TableField("purchase_price")
- private Double purchasePrice;
+ private BigDecimal purchasePrice;
- @ApiModelProperty(value = "售价")
+ @ApiModelProperty(value = "售价（诊所采购价）")
@TableField("sales_amount")
- private Double salesAmount;
+ private BigDecimal salesAmount;
@ApiModelProperty(value = "采购数量")
@TableField("purchase_count")
@@ -67,6 +69,35 @@
@ApiModelProperty(value = "总价")
@TableField("total_price")
- private Double totalPrice;
+ private BigDecimal totalPrice;
+
+ @ApiModelProperty(value = "供应商id")
+ @TableField("supplier_id")
+ private String supplierId;
+
+ @ApiModelProperty(value = "状态0未分账 1已分账")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty(value = "供应商金额")
+ @TableField("supplier_money")
+ private BigDecimal supplierMoney;
+
+ @ApiModelProperty(value = "收款商户号")
+ @TableField("recv_merchant_no")
+ private String recvMerchantNo;
+
+ @ApiModelProperty(value = "接收方编号")
+ @TableField("recv_no")
+ private String recvNo;
+
+
+ @TableField(exist = false)
+ private BigDecimal payMoney;
+
+
+ @TableField(exist = false)
+ private LocalDateTime payTime;
+
}
--
Gitblit v1.7.1