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 | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Client/DesktopMain/Program.cs b/Client/DesktopMain/Program.cs
index 584c8fe..5e5ab6c 100644
--- a/Client/DesktopMain/Program.cs
+++ b/Client/DesktopMain/Program.cs
@@ -20,7 +20,8 @@
LoginFrm loginFrm = new LoginFrm();
loginFrm.ShowDialog();
- Application.Run(new frmMainWindow());//frmMainWindowRLT frmMainWindowAntdUI
+ //
+ Application.Run(new frmMainWindow());//frmMainWindowRLT frmMainWindowAntdUI
//Application.Run(new DPumpHydr.WinFrmUI.Volute.MainDialog());
--
Gitblit v1.9.3