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

wei

2020-12-23 35c4bc03ee8da50317cd3f33e9f52f0a4259affd

 HDL_ON/Entity/Room.cs

old mode 100755
new mode 100644
@@ -523,7 +523,7 @@
            {
                if (CurrentSpatial.FloorList.Count > 0)
                {
                    var f = CurrentSpatial.FloorList.Find((obj) => obj.roomId == parentId);
                    var f = CurrentSpatial.FloorList.Find((obj) => obj.uid == parentId);
                    if (f != null)
                    {
                        return f.roomName + " ";