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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

 screen-api/src/main/java/com/moral/api/pojo/form/uav/UAVQueryTimeSlotForm.java

@@ -49,9 +49,8 @@
                )
            return false;
        //将日期转换为开始结束时间
        List<Date> dates = DateUtils.dateToStartAndEndTime(date);
        startDate = dates.get(0);
        endDate = dates.get(1);
        startDate = DateUtils.getDailyStartTime(date);
        endDate = DateUtils.getDailyEndTime(date);
        return true;
    }
}