From 4f7d8924b8c5f4f019b16a8563e30c48abef441e Mon Sep 17 00:00:00 2001 From: sen <sen@qq.com> Date: 星期一, 01 九月 2025 13:30: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 | 11 +++++++++++ 1 files changed, 11 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..93e947e 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,16 @@ @TableField("remark") private String remark; + /** + * 璋冨害瓒呮椂涓嬪崟锛岃秴鏃�?涓皬鏃� + */ + @TableField(exist = false) + private Integer schedulingTimeout; + + /** + * '棰勮鍑哄彂鏃堕棿 & ord.ESTIMATED_DEPARTURE_TIME 锛岄鍙栭挜鍖欒秴鏃禢涓皬鏃�' + */ + @TableField(exist = false) + private Integer keyTimeout; } -- Gitblit v1.8.0