Merge branch 'CJL-NEW'

wxr

2020-12-07 b12e4aff6b46327e0e92c3295a4a04434c2ea4ec

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

@@ -402,7 +402,7 @@
                Height = Application.GetRealWidth(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            });
            foreach (var tempRoom in DB_ResidenceData.Rooms)
            foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
            {

                Button btnRoom = new Button()