From df88a15b84a7eee09c870dab8c0f5facd6c18c6e Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期三, 25 十二月 2024 09:34:28 +0800
Subject: [PATCH] 修改出水参数即选择界面
---
Client/DesktopMain/Program.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Client/DesktopMain/Program.cs b/Client/DesktopMain/Program.cs
index 3b18069..11d8703 100644
--- a/Client/DesktopMain/Program.cs
+++ b/Client/DesktopMain/Program.cs
@@ -2,8 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
-using DPumpHydr.DesktopMain;
-using DPumpHydr.WinFrmUI.RLT.UI;
+using DPumpHydr.DesktopMain;
namespace DPumpHydr.Client
{
@@ -17,11 +16,12 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
-<<<<<<< HEAD
- Application.Run(new frmMainWindowAntdUI());
-=======
- Application.Run(new DPumpHydr.WinFrmUI.Volute.TempDebugForm());
->>>>>>> 90573e299e2eea301a0ad8585a7e6b95d7a798bb
+
+
+ // Application.Run(new frmMainWindowRLT());//frmMainWindowRLT frmMainWindowAntdUI
+
+ Application.Run(new DPumpHydr.WinFrmUI.Volute.MainDialog());
+
}
}
}
--
Gitblit v1.9.3