From 071ebf36aed1e7ab65f4afc0f378b0df0fc50313 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期日, 28 九月 2025 12:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
index d20df72..120ad4c 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
@@ -95,6 +95,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("estimated_departure_time")
private Date estimatedDepartureTime;
+ /** 棰勮鍑哄彂鏃堕棿 */
+ @Excel(name = "瑕佹眰鍑哄彂鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("required_departure_time")
+ private Date requiredDepartureTime;
/** 瑕佹眰鍒拌揪鏃堕棿 */
--
Gitblit v1.8.0