From ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 27 八月 2025 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java b/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
index 4a7c3ac..2d0a160 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
@@ -47,11 +47,7 @@
*/
@TableField(value = "coal_id")
private Long coalId;
- /**
- * 鐓ょ绫诲瀷
- */
- @TableField(value = "coal")
- private String coal;
+
/**
* 閲囪喘鏁伴噺
*/
@@ -86,10 +82,21 @@
* 鐧昏浜篿d
*/
@TableField(value = "registrant_id")
- private String registrantId;
+ private Long registrantId;
/**
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
private LocalDate registrationDate;
+ /**
+ * 杩愯垂
+ */
+ @TableField(value = "freight")
+ private BigDecimal freight;
+
+ /**
+ * 绫诲瀷锛�1-鎴愬搧锛�2-鍘熸枡锛�
+ */
+ @TableField(value = "type")
+ private Integer type;
}
\ No newline at end of file
--
Gitblit v1.9.3