Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

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

@@ -141,7 +141,7 @@
                        {
                            f.roomIds.Add(room.roomId);
                        }
                        f.SaveFunctionData(true);
                        f.UpdataRoomIds();
                    }
                    room.GetRoomFunctions(true);
                    bodyView.RemoveFromParent();