From 9fea080c2b3f946ab86369946f7e490f8481073a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 16 七月 2024 17:23:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs
similarity index 98%
copy from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.designer.cs
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs
index d3d30e4..c592476 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs
@@ -4,7 +4,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace HStation.WinFrmUI.Xhs.PumpProject
+namespace HStation.WinFrmUI.Xhs.Core
 {
     partial class AddXhsProjectDlg
     {
@@ -39,7 +39,7 @@
             dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
             navigationFrame = new DevExpress.XtraBars.Navigation.NavigationFrame();
             navigationPageForm = new DevExpress.XtraBars.Navigation.NavigationPage();
-            projectUserControl1 = new HStation.WinFrmUI.Xhs.PumpProject.XhsProjectUserControl();
+            projectUserControl1 = new PumpProject.XhsProjectUserControl();
             navigationPageMapSelect = new DevExpress.XtraBars.Navigation.NavigationPage();
             webView21 = new Microsoft.Web.WebView2.WinForms.WebView2();
             stepProgressBar1 = new StepProgressBar();
@@ -312,15 +312,15 @@
             // 
             dxErrorProvider1.ContainerControl = this;
             // 
-            // AddProjectDlg
+            // AddXhsProjectDlg
             // 
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(742, 400);
             Controls.Add(dataLayoutControl1);
-            Name = "AddProjectDlg";
+            Name = "AddXhsProjectDlg";
             StartPosition = FormStartPosition.CenterParent;
-            Text = "娣诲姞";
+            Text = "瀵煎叆椤圭洰";
             Load += AddProjectDlg_Load;
             ((ISupportInitialize)dataLayoutControl1).EndInit();
             dataLayoutControl1.ResumeLayout(false);

--
Gitblit v1.9.3