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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java

@@ -36,5 +36,14 @@
            */
    List<UAVQueryTimeSlotDTO> queryTimeSlot(UAVQueryTimeSlotForm form);

    /**
    * @Description: 根据批次号查询无人机数据
            * @Param: [batch]
            * @return: java.util.List<com.moral.api.entity.HistorySecondUav>
            * @Author: 陈凯裕
            * @Date: 2021/9/13
            */
    List<HistorySecondUav> queryDataByBatch(String batch);


}