Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-03-11 4a9844ac95e2ff67b2a2b1082c30f15c561866c6

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs

@@ -38,6 +38,12 @@
            backAction = action;
        }

        public override void RemoveFromParent()
        {
            backAction?.Invoke();
            base.RemoveFromParent();
        }

        /// <summary>
        /// 加载页面
        /// </summary>