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

guoshilong

2023-05-27 a2989e934129341e30d13a649ea01e008a95348f

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

@@ -4,6 +4,7 @@
import cn.gistack.sm.alarmRule.vo.AlarmRuleVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;

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