Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 2400238fd8ae34a2f10a4ea35db9b1739c534a7e

 ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarFireMapper.java

@@ -73,4 +73,6 @@

    //根据月份统计数量
    List<CountVo> fileYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> fileMonth(ESParam esParam);
}