Merge branch 'master' into test

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -169,7 +169,7 @@
         NOT EXISTS (
             SELECT 1
             FROM merc_msg_info mmi
-            WHERE di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime} and mmi.type = 1 and mmi.work_type = #{query.workType}
+            WHERE di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime} and mmi.type = 2 and mmi.work_type = #{query.workType}
         )
         <if test="query.begin != null">
             and dsim.timeout >= #{query.begin}