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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

 screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVQueryTimeSlotDTO.java

@@ -30,6 +30,7 @@
    * 无人机飞行时间段
    * map中开始时间的key为startTime
    * 结束时间的key为endTime
    * 批次号为batch
    * */
    private List<Map<String,Date>> timeSlot;
    private List<Map<String,Object>> timeSlot;
}