From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +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/XhsProjectSimulationCorePage.Designer.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 73809c1..29bc659 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -78,7 +78,7 @@
xhsProjectSimulationUnMatchingListCtrl1 = new XhsProjectSimulationUnMatchingListCtrl();
docPnlMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
controlContainer5 = new DevExpress.XtraBars.Docking.ControlContainer();
- xhsProjectSimulationMatchingListCtrl1 = new Xhs.XhsProjectSimulationMatchingListCtrl();
+ xhsProjectSimulationMatchingListCtrl1 = new XhsProjectSimulationMatchingListCtrl();
docPnlSearch = new DevExpress.XtraBars.Docking.DockPanel();
controlContainer6 = new DevExpress.XtraBars.Docking.ControlContainer();
xhsProjectSimulationSearchCtrl1 = new XhsProjectSimulationSearchCtrl();
@@ -676,7 +676,7 @@
private DevExpress.XtraBars.Docking.ControlContainer controlContainer5;
private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
- private Xhs.XhsProjectSimulationMatchingListCtrl xhsProjectSimulationMatchingListCtrl1;
+ private XhsProjectSimulationMatchingListCtrl xhsProjectSimulationMatchingListCtrl1;
private DevExpress.XtraBars.BarButtonItem barBtnSetList;
private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
private DevExpress.XtraBars.BarButtonItem barBtnSetValveList;
--
Gitblit v1.9.3