From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Program.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 4757468..1220f48 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -1,10 +1,14 @@
-锘縰sing System;
+锘縰sing CefSharp;
+using CefSharp.WinForms;
+using Gs.DevApp.DevFrm;
+using Gs.DevApp.DevFrm.QC;
+using Gs.DevApp.DevFrm.Work;
+using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
+using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
-using CefSharp.WinForms;
-using CefSharp;
-using Gs.DevApp.DevFrm;
namespace Gs.DevApp
{
@@ -38,7 +42,7 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new XtraForm1();
+ //Application.Run(new XtraForm2());
//return;
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
@@ -48,7 +52,11 @@
{
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
+ {
+ //Application.Run(new DevFrm.User.SysMenu());
+ //return;
Application.Run(new FrmMain());
+ }
}
else
{
--
Gitblit v1.9.3