From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 10e0c20..e7454e3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -287,7 +287,7 @@
                 //鏄剧ず鎴块棿鍚�
                 btnRoomName.Text = mRoom.roomName;
                 var mRoomFunctionList = mRoom.GetRoomFunctions(false);
-                var mRoomSceneList = mRoom.GetRoomScenes(false);
+                var mRoomSceneList = mRoom.GetRoomScenes(true);
                 //閬嶅巻鎵�鏈夊姛鑳藉垪琛�
                 if (mRoomFunctionList != null)
                 {

--
Gitblit v1.8.0