设备分页查询

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

@@ -7,7 +7,7 @@
         select
         info.*,
         sysinfo.android_version, sysinfo.device_sn,
-        status.net_state, status.net_type, status.net_dbm, status.device_state
+        status.net_state, status.net_type, status.net_dbm, status.device_state,
         mr.merc_name
         from device_info info
         join device_sysinfo sysinfo on(info.device_id = sysinfo.device_id)