mqtt指令发布

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

@@ -8,7 +8,7 @@
         info.*,
         sysinfo.android_version, sysinfo.device_sn,
         status.net_state, status.net_type, status.net_dbm, status.device_state,
-        mr.merc_name
+        mr.name as mercName
         <if test="queryPage.lon != null and queryPage.lon != ''">
             ,ROUND(
                 6378.138 * 2 * ASIN(