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

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

@@ -682,7 +682,7 @@
         left join sms_alarm_setting b on a.alarm_setting_id=b.id and b.status = 1 and b.alarm_condition!='='
         <include refid="alarmDetailJoins"/>
         where a.`STATUS` = 1
-        and a.DEVICE_ID=#{deviceId} and a.scene_id=#{sceneId} and a.state=1
+        and a.DEVICE_ID=#{deviceId} and (a.scene_id=#{sceneId} or a.PARENT_SCENE_ID=#{sceneId}) and a.state=1
     </select>
 
     <select id="getAlarmInfoForWorkOrderManage" resultType="com.huaxu.dto.DeviceAlarmInfoForOrder">