设备需要加房间名称

appapi/src/main/java/tech/glinfo/enbao/modules/sh/dto/ShDeviceIndex.java

@@ -20,4 +20,6 @@ public class ShDeviceIndex {
     private Integer roomId;
 
     private String pic;
+
+    private String roomName;
 }

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

@@ -26,6 +26,7 @@
             <result column="onlineStatus" property="onlineStatus"/>
             <result column="room_id" property="roomId"/>
             <result column="pic" property="pic"/>
+            <result column="room_name" property="roomName"/>
         </collection>
         <collection property="rooms" ofType="tech.glinfo.enbao.modules.sh.dto.ShFamilyRoomIndex" columnPrefix="room_">
             <result column="id" property="id"/>
@@ -52,6 +53,7 @@
             b.numbering device_numbering,
             b.online_status device_onlineStatus,
             b.room_id device_room_id,
+            c.name device_room_name,
             b.pic device_pic,
             c.id room_id,
             c.name room_name