|
|
@@ -400,7 +400,11 @@
|
|
|
FROM device_info info
|
|
|
JOIN device_status status ON info.device_id = status.device_id
|
|
|
join device_sysinfo sysinfo on info.device_id = sysinfo.device_id
|
|
|
-
|
|
|
+ join device_register dr on (info.device_id = dr.device_id)
|
|
|
+ left join merc mr on (info.merc_id = mr.id)
|
|
|
+ left join merc_place mp on (info.place_id = mp.id)
|
|
|
+ left join merc_line ml on (info.place_line_id = ml.id)
|
|
|
+ left join sys_region sr on (info.district_id = sr.id)
|
|
|
<where>
|
|
|
<if test="queryPage.isBindMerc != null">
|
|
|
<choose>
|
