Merge remote-tracking branch 'origin/dev-CQY' into lss

lss

2022-05-26 44b319fd04ddcd6da211ce0b63fb6844004dad6d

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs

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

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

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