Merge branch 'WJC' into NewFilePath

wxr

2020-12-21 f25c6122eb7e26be5e7f036cf29b9019c4953be2

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs

@@ -644,6 +644,7 @@
                pictureOptionView.Parent.RemoveFromParent();
                Action<string> action = (obj) => {
                    room.backgroundImage = obj;
                    btnRoomBg.ImageBytes = null;//解决有ImageBytes不加载ImagePath
                    btnRoomBg.ImagePath = room.backgroundImage;
                };