From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath

---
 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
index 0b17f56..d7f64c0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -51,11 +51,11 @@
                 {
                     if (btnChooseAll.IsSelected)
                     {
-                        function.roomIds.Add(room.uid);
+                        function.roomIds.Add(room.roomId);
                     }
                     else
                     {
-                        function.roomIds.Remove(room.uid);
+                        function.roomIds.Remove(room.roomId);
                     }
                     function.SaveFunctionData(true);
                 }
@@ -70,12 +70,12 @@
         {
             if (isAdd)
             {
-                function.roomIds.Add(room.uid);
+                function.roomIds.Add(room.roomId);
                 room.AddRoomFunction(function);
             }
             else
             {
-                function.roomIds.Remove(room.uid);
+                function.roomIds.Remove(room.roomId);
                 room.RemoveRoomFunction(function);
             }
             function.SaveFunctionData(true);

--
Gitblit v1.8.0