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

wei

2020-12-12 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11

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

@@ -61,7 +61,7 @@
                Action action = () =>
                {
                    //该楼层删除之后，绑定该楼层的房间要重置绑定的楼层
                    foreach (var r in DB_ResidenceData.residenceData.Rooms)
                    foreach (var r in SpatialInfo.CurrentSpatial.RoomList)
                    {
                        if (r.parentId == btn.Tag.ToString())
                        {