Merge branch 'CJL' into NewFilePath

wxr

2020-12-15 dbf79099f47d5f06223edfd5b8dc06c51b1830aa

 HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs

@@ -41,7 +41,7 @@
                deleteAction?.Invoke();
            };

            var skipPage = new RoomEditPage(room, StringId.EditRoomInfo, editBackAction, delAction);
            var skipPage = new RoomEditPage(room, editBackAction, delAction);
            MainPage.BasePageView.AddChidren(skipPage);
            skipPage.LoadPage();
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;