Merge branch 'master' into test

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -328,9 +328,7 @@
         </if>
         <if test="queryPage.merc != null and queryPage.merc != ''">
             and (
-            info.merc_id = #{queryPage.merc} or info.merc_code = #{queryPage.merc} or
-            LOCATE(#{queryPage.merc}, mr.name)
-            > 0
+            info.merc_id = #{queryPage.merc} or LOCATE(#{queryPage.merc}, info.merc_code) > 0 or LOCATE(#{queryPage.merc}, mr.name) > 0
             )
         </if>
         <if test="queryPage.placeId != null">