Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -56,7 +56,11 @@
            {
                //修改功能所属房间之后的回调事件
                Action chooseRoomBackAction = () => {
                    btnLocationValues.Text = function.GetRoomListName();
                    try
                    {
                        btnLocationValues.Text = function.GetRoomListName();
                    }
                    catch { }
                };
                var view = new ChooseRoomPage(function,chooseRoomBackAction);
                MainPage.BasePageView.AddChidren(view);