Merge remote-tracking branch 'origin/master'

nnnjjj123

2021-01-29 047e1ec0b94317cc2a65657b4b101c5f769c3530

 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!=''">