Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 3c08ca7661566c94012040647428fee759820b39

 ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java

@@ -71,4 +71,6 @@

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