Merge branch 'usky-zyj' into server-165

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAlarmMapper.xml

@@ -52,7 +52,7 @@
         from dmp_device ddi
         <where>
             <if test="1 == 1">
-                and delete_flag = 0
+                and delete_flag = 0 and service_status = 2
             </if>
             <if test="1 == 1">
                 and device_id in