|
@@ -35,7 +35,7 @@
|
|
|
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)
|
|
|
join device_status status on(info.device_id = status.device_id)
|
|
join device_status status on(info.device_id = status.device_id)
|
|
|
- left join merc_register mr on(info.merc_id = mr.merc_id)
|
|
|
|
|
|
|
+ left join merc mr on(info.merc_id = mr.merc_id)
|
|
|
where
|
|
where
|
|
|
info.show_status = #{queryPage.showStatus}
|
|
info.show_status = #{queryPage.showStatus}
|
|
|
<if test="queryPage.no != null and queryPage.no != ''">
|
|
<if test="queryPage.no != null and queryPage.no != ''">
|
