From 047e1ec0b94317cc2a65657b4b101c5f769c3530 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 29 Jan 2021 11:59:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 33fb909..caf4216 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -106,7 +106,7 @@
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
- <if test="district!=null and district!=''">
+ <if test="addvcd!=null and addvcd!=''">
and a.district=#{district}
</if>
<if test="waringType!=null and waringType!=''">
--
Gitblit v1.9.3