Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

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