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

sen

2025-09-28 071ebf36aed1e7ab65f4afc0f378b0df0fc50313

 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;


    /** 要求到达时间 */