Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordService.java

@@ -19,4 +19,18 @@
    * @return
    */
   Object selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord);

   /**
    * 按行政区统计告警-按三大类
    * @param alarmRecord
    * @return
    */
   Object statisticAlarmRecordByType(AlarmRecordVO alarmRecord);

   /**
    * 按行政区统计告警
    * @param alarmRecord
    * @return
    */
   Object statisticAlarmRecord(AlarmRecordVO alarmRecord);
}