Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 a6bad443ca7e9d01ebf22e1a0b2452b9e25120e7

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs

@@ -156,7 +156,7 @@
            };
            bodyView.AddChidren(functionListView);

            foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
            foreach (var function in FunctionList.List.GetDeviceFunctionList())
            {
                function.roomIds.Remove(null);
                if (function.roomIds.Count > 0 )