Merge branch 'tzy2' into newBranch1

wxr

2021-07-01 3861152ee23bfc0724579299b6be188f5f16b192

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

@@ -157,10 +157,8 @@
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                var skipPage = new AdminMigrationConfirmPage();
                MainPage.BasePageView.AddChidren(skipPage);
                skipPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                var form = new AdminMigrationConfirmPage();
                form.AddForm();
            };

            administratorPermissionMigrationRow.MouseUpEventHandler = eventHandler;
@@ -176,8 +174,8 @@
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                var from = new TransferConfirmPage();
                from.AddForm();
                var form = new TransferConfirmPage();
                form.AddForm();
            };

            transferRow.MouseUpEventHandler = eventHandler;