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/AlarmRuleService.java

@@ -18,5 +18,12 @@
    * @param alarmRule
    * @return
    */
   IPage<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule);
   Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule);

   /**
    * 通过id查询
    * @param id
    * @return
    */
   AlarmRuleVO getDetail(String id);
}