From db8e73b120963810d6febdb939612db12d26996e Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 18 十二月 2025 14:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 afc1b31..86d8425 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
+import java.util.List;
+
import lombok.Data;
/**
* 璋冨害鍗曠鐞嗗璞� tms_dispatch_order
@@ -187,6 +189,15 @@
@TableField("earliest_departure")
private Date earliestDeparture;
+
+ /** 涓嬪崟鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("order_time")
+ private Date orderTime;
+ @TableField(exist = false)
+ private String orderTimeBegin;
+ @TableField(exist = false)
+ private String orderTimeEnd;
/** 鍙戣揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
@Excel(name = "鍙戣揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
@@ -387,7 +398,8 @@
@Excel(name = "鐘舵��")
@TableField("status")
private Integer status;
-
+ @TableField(exist = false)
+ private List<Integer> inStatusList;
/** 鍒涘缓浜� */
@TableField("create_by")
@@ -499,6 +511,13 @@
private String okTimeBegin;
@TableField(exist = false)
private String okTimeEnd;
+ @TableField("commission_model")
+ private Integer commissionModel;
+
+ @TableField(exist = false)
+ private List<TmsQuoteFee> quoteFeeItems;
+ @TableField(exist = false)
+ private List<TmsReceivableFeeItem> tmsReceivableFeeItems;
}
\ No newline at end of file
--
Gitblit v1.8.0