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

guoshilong

2023-05-29 08c7fcce9fa2a876412fa81a19550b77996214e2

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

@@ -18,5 +18,5 @@
    * @param alarmRecord
    * @return
    */
   IPage<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord);
   Object selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord);
}