Merge branch 'CJL' into NewFilePath

wxr

2021-01-04 6955f92085a3702cfef5473fb14a77b3d9addbcf

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

old mode 100644
new mode 100755
@@ -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 )