Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-07-08 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac

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

@@ -282,7 +282,11 @@
                Height = Application.GetRealHeight(65),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            //contentView.AddChidren(administratorPermissionMigrationRow);
            if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
            {
                //是主账号本人才能显示这个菜单
                contentView.AddChidren(administratorPermissionMigrationRow);
            }

            btnAdministratorPermissionMigrationTitle = new Button()
            {