Merge branch 'WJC'

wxr

2020-12-09 b5f348ec1381a8b05d00e585a3e156381f751d72

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

@@ -70,9 +70,9 @@
                    {
                        foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
                        {
                            if (f.roomIds.Contains(room.uid))
                            if (f.roomIds.Contains(room.roomId))
                            {
                                f.roomIds.Remove(room.uid);
                                f.roomIds.Remove(room.roomId);
                            }
                        }
                        SpatialInfo.CurrentSpatial.DelRoom(room);