From 31e23deb9ae71263fb59fcd82c26b22c9cdfc3d4 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 六月 2025 15:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after
---
main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
index e97889f..49fa6da 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
@@ -8,7 +8,7 @@
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
/**
* 姝ｅ紡搴撳瓨琛� 瀹炰綋绫�
@@ -63,10 +63,15 @@
@TableField(value = "total_price_including_tax")
private BigDecimal totalPriceIncludingTax;
/**
- * 鎴愭湰鍗曚环
+ * 涓嶅惈绋庡崟浠�
*/
- @TableField(value = "cost_per_unit")
- private BigDecimal costPerUnit;
+ @TableField(value = "price_excluding_tax")
+ private BigDecimal priceExcludingTax;
+ /**
+ * 涓嶅惈绋庢�讳环
+ */
+ @TableField(value = "total_price_excluding_tax")
+ private BigDecimal totalPriceExcludingTax;
/**
* 寰呰ˉ搴�
*/
@@ -81,5 +86,11 @@
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
- private Date registrationDate;
+ private LocalDate registrationDate;
+
+ /**
+ * 鍚堝苟id
+ */
+ @TableField(value = "merge_id")
+ private String mergeId;
}
\ No newline at end of file
--
Gitblit v1.9.3