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

sms_water/src/main/resources/mapper/SceneMapper.xml

@@ -556,7 +556,10 @@
             (
                 select count(1) amount, concat(label,op) label from
                     (
-                        select if(d.REMARK is null,e.NAME,d.REMARK) label,CASE WHEN ALARM_CONDITION='>' OR ALARM_CONDITION='>=' then '高' WHEN ALARM_CONDITION='<' OR ALARM_CONDITION='<=' then '低' end op
+                        select if(d.REMARK is null,e.NAME,d.REMARK) label,CASE WHEN ALARM_CONDITION='>' OR ALARM_CONDITION='>=' then '高'
+                        WHEN ALARM_CONDITION='<' OR ALARM_CONDITION='<=' then '低'
+                        WHEN ALARM_CONDITION='=' then '等于'
+                        end op
                         <if test="sort == 2">
                             from sms_scene a INNER JOIN sms_scene_type b on a.SCENE_TYPE_ID=b.ID
                             INNER JOIN sms_alarm_details c on c.PARENT_SCENE_ID=a.ID