Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java

@@ -20,6 +20,7 @@
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
import org.sxkj.fw.record.param.FwDroneAlarmRecordExportParam;
import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
import org.sxkj.fw.record.excel.FwDroneAlarmRecordExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -46,14 +47,14 @@
   /**
    * 导出数据
    *
    * @param queryWrapper
    * @param fwDroneAlarmRecord
    * @return
    */
   List<FwDroneAlarmRecordExcel> exportFwDroneAlarmRecord(Wrapper<FwDroneAlarmRecordEntity> queryWrapper);
   List<FwDroneAlarmRecordExcel> exportFwDroneAlarmRecord(FwDroneAlarmRecordExportParam fwDroneAlarmRecord);

   /**
    *
    * @return
    */
   AlarmStatisticsVO alarmTypeStatistics();
   AlarmStatisticsVO alarmTypeStatistics(String regionName, String currentDeptId);
}