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

Shuxia Ning

2024-10-12 b94da76188b834922d2f13365b22208a4bc4049a

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.Designer.cs

@@ -35,7 +35,7 @@
            tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
            tabNavigationPage1 = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            tabNavigationPagePump = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            pumpMatchingCtrl1 = new XhsProjectSimulationPumpMatchingListCtrl();
            pumpMatchingCtrl1 = new XhsPumpMatchingListCtrl();
            tabNavigationPage3 = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            valveMatchingCtrl1 = new XhsProjectSimulationValveMatchingListCtrl();
            tabNavigationPage4 = new DevExpress.XtraBars.Navigation.TabNavigationPage();
@@ -290,7 +290,7 @@
        private DevExpress.XtraBars.Navigation.TabPane tabPane1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPagePump;
        private XhsProjectSimulationPumpMatchingListCtrl pumpMatchingCtrl1;
        private XhsPumpMatchingListCtrl pumpMatchingCtrl1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage3;
        private XhsProjectSimulationValveMatchingListCtrl valveMatchingCtrl1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage4;