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

zengh

2021-01-29 83bed9e77878cbe11e797b58fa2c2a48061e4555

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