From 18d292f1091b8b86ad29ba76e3cbe8ffaf2c222e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 六月 2025 17:45:39 +0800
Subject: [PATCH] 1.正式库合并以及优化 2.销售模块
---
main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 d965baf..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;
/**
* 姝ｅ紡搴撳瓨琛� 瀹炰綋绫�
@@ -26,7 +26,12 @@
* 涓婚敭ID
*/
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
+ /**
+ * 寰呭叆搴搃d
+ */
+ @TableField(value = "pending_id")
+ private Long pendingId;
/**
* 渚涜揣鍟嗗悕绉�
*/
@@ -35,8 +40,8 @@
/**
* 鐓ょ
*/
- @TableField(value = "coal_type")
- private String coalType;
+ @TableField(value = "coal")
+ private String coal;
/**
* 鍗曚綅
*/
@@ -58,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;
/**
* 寰呰ˉ搴�
*/
@@ -76,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