From 1d6f916b5254a31a086f897acb0d4a5913a3e332 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 14:59:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
index 8c31c93..476e1a6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
@@ -8,6 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -51,10 +52,14 @@
 
     @ApiModelProperty(value = "单价")
     @TableField("unit_amount")
-    private Double unitAmount;
+    private BigDecimal unitAmount;
 
     @ApiModelProperty(value = "总价")
     @TableField("total_price")
-    private Double totalPrice;
+    private BigDecimal totalPrice;
 
+
+    @ApiModelProperty(value = "入库单号")
+    @TableField("warehouse_no")
+    private String warehouseNo;
 }

--
Gitblit v1.7.1