From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'

---
 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index 3b56c1e..26fe4c8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -82,7 +82,7 @@
             };
             allRoomView.AddChidren(btnChooseAll);
 
-            foreach(var room in DB_ResidenceData.Rooms)
+            foreach(var room in DB_ResidenceData.residenceData.Rooms)
             {
                 var roomView = new FrameLayout()
                 {

--
Gitblit v1.8.0