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

cjl

2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000

 screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java

@@ -5,6 +5,7 @@

import com.moral.api.entity.HistorySecondUav;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.dto.uav.UAVGetBD;
import com.moral.api.pojo.dto.uav.UAVResultDTO;

/**
@@ -19,4 +20,6 @@


    List<HistorySecondUav> reList(Map<String,Object> map);

    List<UAVGetBD> reListDetail(Map<String,Object> map);
}