From ae3cd0dd4764559f98e1700faf889f5eddd8ac2b Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期日, 28 九月 2025 16:16:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index 396bc7f..60bcd5a 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -214,7 +214,7 @@
}
Integer keyTimeout = keyCollectionInfo.getKeyTimeout();
if (keyTimeout!=null && keyTimeout>24){
- Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
+ Date estimatedDepartureTime = keyCollectionInfo.getRequiredDepartureTime();
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
logger.info("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
--
Gitblit v1.8.0