Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-11-08 943c5905b7f4ff48c7ae87c41b41aeae854f8a20

 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;
}