From 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期一, 06 五月 2024 14:55:46 +0800
Subject: [PATCH] 冲突解决
---
Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs b/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs
index 3d59ee0..2e48ed2 100644
--- a/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs
+++ b/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs
@@ -26,7 +26,8 @@
public static string Path
{
get
- {
+ {
+ if (path == null) path = Directory.GetCurrentDirectory()+"\\";
return path;
}
set
--
Gitblit v1.9.3