From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.Designer.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.Designer.cs
index 9faaba7..7581c3c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.Designer.cs
+++ b/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;

--
Gitblit v1.9.3