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

JLChen

2021-07-08 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -131,7 +131,7 @@
            LoadTopView();
        }

        public void LoadTopView_RoomTop(Action backAction ,Action editAction)
        public void LoadTopView_RoomTop(Action backAction, Action editAction)
        {
            this.backAction = backAction;

@@ -275,7 +275,7 @@
        /// <summary>
        /// 楼层管理顶部栏
        /// </summary>
        public void LoadTopView_FloorTopView(Action<string> callBack,Action action)
        public void LoadTopView_FloorTopView(Action<string> callBack, Action action)
        {
            LoadTopView();