Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-21 5f46903845cf9b2cb4d7f186370d3eb7fb6c9577

 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)
                {