From e98de937b28d42493de5dea6365c853d6b412d3c Mon Sep 17 00:00:00 2001
From: chenn <gu.beic@qq.com>
Date: 星期五, 11 四月 2025 17:06:10 +0800
Subject: [PATCH] 解决冲突
---
Client/DesktopMain/Program.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Client/DesktopMain/Program.cs b/Client/DesktopMain/Program.cs
index e457b24..5e5ab6c 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
{
@@ -18,9 +17,13 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- //Application.Run(new frmMainWindowRLT());//frmMainWindowRLT frmMainWindowAntdUI
+ LoginFrm loginFrm = new LoginFrm();
+ loginFrm.ShowDialog();
- Application.Run(new DPumpHydr.WinFrmUI.Volute.MainDialog());
+ //
+ Application.Run(new frmMainWindow());//frmMainWindowRLT frmMainWindowAntdUI
+
+ //Application.Run(new DPumpHydr.WinFrmUI.Volute.MainDialog());
}
}
--
Gitblit v1.9.3