Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 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);