From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
NETERPNoWin/Program.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/NETERPNoWin/Program.cs b/NETERPNoWin/Program.cs
index 4fe6a38..77311bb 100644
--- a/NETERPNoWin/Program.cs
+++ b/NETERPNoWin/Program.cs
@@ -25,10 +25,12 @@
{
if (DBUtility.ClsPub.CheckUpdate())
{
- string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
- System.Diagnostics.Process.Start(strFileName);
- Application.Exit();
- return;
+ //string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
+ //System.Diagnostics.Process.Start(strFileName);
+ //Application.Exit();
+ //return;
+ MESMain oMESMain = new MESMain();
+ Application.Run(oMESMain);
}
else
{
--
Gitblit v1.9.1