From 83bed9e77878cbe11e797b58fa2c2a48061e4555 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 11:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into 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 1c16a1e..3ba1456 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
@@ -107,7 +107,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