Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-09-27 326a0e7cf1b95ec71f85a26fd960a647b6d79da7

Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs

@@ -174,7 +174,7 @@
            barBtnMatchingList.Id = 10;
            barBtnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatchingList.ImageOptions.SvgImage");
            barBtnMatchingList.Name = "barBtnMatchingList";
            barBtnMatchingList.ItemClick += barBtnMatching_ItemClick;
            barBtnMatchingList.ItemClick += barBtnMatchingList_ItemClick;
            // 
            // barBtnUnMatchingList
            // 

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -208,7 +208,7 @@
        #region 自动匹配

        //自动匹配
        private void barBtnMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        private void barBtnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_hydroInfo == null)
            {