From c0f6fb84a98db212b0780f44430d4e0cdf1b0302 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 10 九月 2025 15:20:57 +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 | 14 ++++++++++++++
1 files changed, 14 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 79fb6d4..d20df72 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
@@ -161,5 +161,19 @@
@TableField("remark")
private String remark;
+ /**
+ * 璋冨害瓒呮椂涓嬪崟锛岃秴鏃�?涓皬鏃�
+ */
+ @TableField(exist = false)
+ private Integer schedulingTimeout;
+ /**
+ * '棰勮鍑哄彂鏃堕棿 & ord.ESTIMATED_DEPARTURE_TIME 锛岄鍙栭挜鍖欒秴鏃禢涓皬鏃�'
+ */
+ @TableField(exist = false)
+ private Integer keyTimeout;
+
+ @Excel(name = "閽ュ寵鏌滅紪鍙�")
+ @TableField("box_num")
+ private String boxNum;
}
--
Gitblit v1.8.0