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/PumpImportByExcelCtrl.designer.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelCtrl.designer.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelCtrl.designer.cs
similarity index 98%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelCtrl.designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelCtrl.designer.cs
index e70ab56..3a9e282 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelCtrl.designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelCtrl.designer.cs
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI.Phart
{
- partial class ImportPumpPerform2dByExcelCtrl
+ partial class PumpImportByExcelCtrl
{
/// <summary>
/// Requipuired designer variable.
@@ -30,7 +30,7 @@
{
components = new System.ComponentModel.Container();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImportPumpPerform2dByExcelCtrl));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PumpImportByExcelCtrl));
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
--
Gitblit v1.9.3