From f4d5aa97370f698c63b0b9f185f06e7bae56975c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 19 八月 2025 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Program.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 90d9eae..801da22 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -1,11 +1,10 @@
锘縰sing CefSharp;
using CefSharp.WinForms;
-using DevExpress.Drawing.Internal.Fonts.Interop;
using Gs.DevApp.DevFrm;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
using System;
-using System.Configuration;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
@@ -53,7 +52,8 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- // Application.Run(new DevFrm.User.SysMenu());
+ //Application.Run(new DevFrm.User.SysMenu());
+ //return;
bool IsWeight = false;
try
{
@@ -63,7 +63,7 @@
{
}
if (IsWeight == true)
- Application.Run(new Frm_Work09());
+ Application.Run(new Frm_Work09(QcSeason.浜х嚎绉伴噸.ToString()));
else
Application.Run(new FrmMain());
}
--
Gitblit v1.9.3