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

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

 screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java

@@ -37,6 +37,7 @@
                newMap.put("endTime",DateUtils.dateToDateString(endDate, "yyyy-MM-dd HH:mm:ss"));
                //存入batch批号
                newMap.put("batch", (String) map.get("batch"));
                newMap.put("total",map.get("total").toString());
                timeSlotVo.add(newMap);
            }
            vo.setTimeSlot(timeSlotVo);