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

guoshilong

2023-05-23 76d9d4af124631ffe68c5f8dfd2c6d54c61fcefa

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

@@ -11,15 +11,15 @@
/**
 * 告警规则mapper映射层
 * @author zhongrj
 * @date 2023-05-55
 * @date 2023-05-23
 */
public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {

   /**
    * 自定义分页列表查询
    * @param page
    * @param alarmRule
    * @param alarmRecord
    * @return
    */
    List<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, @Param("alarmRule") AlarmRuleVO alarmRule);
    List<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page,@Param("alarmRule") AlarmRuleVO alarmRule);
}