From dbcef6befb123066754141adef6dc3ef6653b6ce Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 02 十二月 2024 14:34:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelDlg.Designer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelDlg.Designer.cs
similarity index 98%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelDlg.Designer.cs
index a4e519e..eaa14c5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelDlg.Designer.cs
@@ -1,7 +1,7 @@
锘�
namespace Yw.WinFrmUI.Phart
{
- partial class ImportPumpPerform2dByExcelDlg
+ partial class PumpImportByExcelDlg
{
/// <summary>
/// Requipuired designer variable.
@@ -31,7 +31,7 @@
{
this.components = new System.ComponentModel.Container();
this.dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
- this.importCurveByExcelCtrl1 = new Yw.WinFrmUI.Phart.ImportPumpPerform2dByExcelCtrl();
+ this.importCurveByExcelCtrl1 = new Yw.WinFrmUI.Phart.PumpImportByExcelCtrl();
this.btnOk = new DevExpress.XtraEditors.SimpleButton();
this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -201,7 +201,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
- private ImportPumpPerform2dByExcelCtrl importCurveByExcelCtrl1;
+ private PumpImportByExcelCtrl importCurveByExcelCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
--
Gitblit v1.9.3