From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchFeeSummaryVi.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchFeeSummaryVi.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchFeeSummaryVi.java
index 3203f07..0ee8666 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchFeeSummaryVi.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchFeeSummaryVi.java
@@ -21,6 +21,11 @@
@Excel(name = "鏃ユ湡",dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date orderTime;
+ @TableField(exist = false)
+ private String orderTimeBegin;
+ @TableField(exist = false)
+ private String orderTimeEnd;
+
/** 瀹㈡埛鍚嶇О */
@Excel(name = "瀹㈡埛")
@@ -29,6 +34,9 @@
/** 椤圭洰鍚嶇О */
@Excel(name = "椤圭洰鍚嶇О")
private String projectName;
+ //杩愯緭璺嚎
+ @TableField(exist = false)
+ private String address;
/** 鍙戣揣鍖哄煙 */
@Excel(name = "瑁呰揣鍦板尯鍩�")
@@ -192,7 +200,7 @@
@TableField(exist = false)
private BigDecimal grossProfitRadioHkd;
-
+ private String remark;
}
--
Gitblit v1.8.0