设备房间名称

appapi/src/main/resources/mapper/sh/OtherShFamilyDao.xml

@@ -53,12 +53,13 @@
             b.numbering device_numbering,
             b.online_status device_onlineStatus,
             b.room_id device_room_id,
-            c.name device_room_name,
+            d.name device_room_name,
             b.pic device_pic,
             c.id room_id,
             c.name room_name
         FROM
             sh_family a LEFT JOIN sh_device b ON a.id = b.family_id LEFT JOIN sh_family_room c ON a.id = c.family_id
+            LEFT JOIN sh_family_room d ON b.room_id = c.id
         WHERE
         <choose>
             <when test="familyId != null and familyId !=''">