Merge branch 'WJC' into temp-wxr

wxr

2021-06-23 7addb1dc6d80cc48c0478aa7ac9820363d4eebf6

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

@@ -282,7 +282,7 @@
                Height = Application.GetRealHeight(65),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            contentView.AddChidren(administratorPermissionMigrationRow);
            //contentView.AddChidren(administratorPermissionMigrationRow);

            btnAdministratorPermissionMigrationTitle = new Button()
            {