From de1a42d853176d83805c1290d7381235a9780a2d Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 18 十一月 2025 11:58:57 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
index f9c86b3..d8c923b 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
@@ -35,6 +35,8 @@
@TableField("customer_id")
private Integer customerId;
+ @TableField("customer_code")
+ private String customerCode;
/** 瀹㈡埛缂栫爜 */
@TableField("customer_name")
@@ -181,7 +183,7 @@
/** 瑕佹眰鏈�鏃╁嚭鍙戞椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("earliest_departure")
private Date earliestDeparture;
@@ -193,7 +195,7 @@
/** 瑕佹眰鏈�鏅氬嚭鍙戞椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("latest_departure")
private Date latestDeparture;
@@ -211,7 +213,7 @@
/** 瑕佹眰鏈�鏃╁埌杈炬椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("earliest_arrival")
private Date earliestArrival;
@@ -223,7 +225,7 @@
/** 瑕佹眰鏈�鏅氬埌杈炬椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("latest_arrival")
private Date latestArrival;
@@ -232,6 +234,10 @@
@Excel(name = "鍙戣揣琛屾斂鍖哄煙")
@TableField("shipper_region_code")
private String shipperRegionCode;
+
+ @Excel(name = "鍙戣揣琛屾斂鍖哄煙")
+ @TableField("shipper_region_label")
+ private String shipperRegionLabel;
/** 鍑哄彂鍦板湴鍧� */
@@ -295,6 +301,10 @@
@Excel(name = "鏀惰揣琛屾斂鍖哄煙")
@TableField("receiver_region_code")
private String receiverRegionCode;
+
+ @Excel(name = "鏀惰揣琛屾斂鍖哄煙")
+ @TableField("receiver_region_label")
+ private String receiverRegionLabel;
/** 瀹為檯鍒拌揪鏃堕棿 */
@@ -414,5 +424,25 @@
@TableField("accounts_payable_status")
private Integer accountsPayableStatus;
+ @TableField("collection_plan_id")
+ private Integer collectionPlanId;
+ @TableField(exist = false)
+ private Integer collectionPlanDetailId;
+ @TableField(exist = false)
+ private BigDecimal collectionPlanAmount;
+
+ @TableField(exist = false)
+ private String collectionPlanName;
+
+ @TableField("payment_plan_id")
+ private Integer paymentPlanId;
+
+ @TableField(exist = false)
+ private String paymentPlanName;
+ @TableField(exist = false)
+ private Integer paymentPlanDetailId;
+
+ @TableField(exist = false)
+ private BigDecimal paymentPlanAmount;
}
\ No newline at end of file
--
Gitblit v1.8.0