From e72209e7deabcea4545e374e2b9335566650aa74 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 18 九月 2025 16:18:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Program.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 32c3409..e0e4483 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -42,6 +42,8 @@
/// </summary>
private static void _startLogin()
{
+ //Application.Run(new XtraForm1());
+ //return;
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
Cef.Initialize(settings);
@@ -51,8 +53,8 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- Application.Run(new DevFrm.User.SysMenu());
- return;
+ //Application.Run(new DevFrm.User.SysMenu());
+ //return;
Application.Run(new FrmMain());
}
}
--
Gitblit v1.9.3