Merge remote-tracking branch 'origin/WJC'

wxr

2020-12-01 a46cd0adb5af29e8a9cf47c219475acaedfcf839

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

@@ -32,7 +32,7 @@
            {
                room.SaveRoomData();
                ReLoadPage();
                ReloadRoomName(room);
                ReloadRoomName();
            };
            var skipPage = new RoomEditPage(room, StringId.EditRoomInfo, editBackAction);
            MainPage.BasePageView.AddChidren(skipPage);