|
@@ -7,7 +7,7 @@
|
|
|
select
|
|
select
|
|
|
info.*,
|
|
info.*,
|
|
|
sysinfo.android_version, sysinfo.device_sn,
|
|
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
|
|
mr.merc_name
|
|
|
from device_info info
|
|
from device_info info
|
|
|
join device_sysinfo sysinfo on(info.device_id = sysinfo.device_id)
|
|
join device_sysinfo sysinfo on(info.device_id = sysinfo.device_id)
|
