From c8fbeff3b07f96ffb4624dd64344ac00ec0c8ef8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 18 七月 2025 11:03:47 +0800
Subject: [PATCH] 1.优化正式库 2.yml设置
---
main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 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..d5fcc4e 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
@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
/**
* 姝ｅ紡搴撳瓨琛� 瀹炰綋绫�
@@ -20,23 +21,27 @@
@TableName("official_inventory")
public class OfficialInventory extends MyBaseEntity {
- private static final long serialVersionUID = 1L;
-
/**
* 涓婚敭ID
*/
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
- * 渚涜揣鍟嗗悕绉�
+ * 寰呭叆搴搃d
*/
- @TableField(value = "supplier_name")
- private String supplierName;
+ @TableField(value = "pending_id")
+ private Long pendingId;
+ /**
+ * 渚涜揣鍟咺D
+ */
+ @TableField(value = "supplier_id")
+ private Long supplierId;
+
/**
* 鐓ょ
*/
- @TableField(value = "coal_type")
- private String coalType;
+ @TableField(value = "coal_id")
+ private Long coalId;
/**
* 鍗曚綅
*/
@@ -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;
/**
* 寰呰ˉ搴�
*/
@@ -71,10 +81,24 @@
* 鐧昏浜篿d
*/
@TableField(value = "registrant_id")
- private String registrantId;
+ private Long registrantId;
+
/**
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
- private Date registrationDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate registrationDate;
+
+ /**
+ * 鐓よ川鏂规id
+ */
+ @TableField(value = "coal_plan_id")
+ private Long coalPlanId;
+
+ /**
+ * 鍚堝苟id
+ */
+ @TableField(value = "merge_id")
+ private String mergeId;
}
\ No newline at end of file
--
Gitblit v1.9.3