From abaf72a337248943e037b02d069c094e2ee5d60b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 05 Jul 2023 14:46:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
index 1a1b1c3..49faa9e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
@@ -4,7 +4,9 @@
<!--自定义分页列表查询-->
<select id="selectAlarmRulePage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRuleVO">
- select sar.* from YWXT.sm_alarm_rule sar where sar.is_deleted = 0
+ select sar.*
+ from YWXT.sm_alarm_rule sar
+ where sar.is_deleted = 0
<if test="alarmRule.type!=null and alarmRule.type!=''">
and sar.type = #{alarmRule.type}
</if>
--
Gitblit v1.9.3