Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

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