Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

wujianwei

2025-09-02 dda4c08d41693d2495a13e7db230c3e9747540de

 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 ，领取钥匙超时N个小时'
     */
    @TableField(exist = false)
    private Integer keyTimeout;

}