Merge remote-tracking branch 'origin/wxr4' into dev-tzy

tzy

2021-05-14 ee5f2543624a0e3ae9d046062b822727a31685e1

 HDL_ON/Entity/Room.cs

@@ -46,7 +46,7 @@
        public SpatialInfo(string spatialType)
        {
            roomType = "FLOOR";
            parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
            parentId = DB_ResidenceData.Instance.CurrentRegion.id;
        }

        public string roomId = "";