Merge branch 'WJC' into wxr6

wxr

2021-06-09 ac2aeba22ed55fd81bd87a373017933ecb49508c

 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 = "";