Merge branch 'tzy2' into MergeFL

wxr

2021-07-05 5a64fc39289d4121b2950c07a4b6e43cf76dd4a5

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -606,8 +606,7 @@
                else
                {
                    //跳转到逻辑界面
                    UI2.Intelligence.Automation.MainView logicMainView = new UI2.Intelligence.Automation.MainView();
                    logicMainView.SkipAddLogicPage();
                    UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                }
            };
        }