From 9490957edfc694a0378ee52af47e921b8ac44e7a Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期二, 04 六月 2024 09:12:11 +0800
Subject: [PATCH] 冲突
---
Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs b/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs
index 2e48ed2..d80b4a6 100644
--- a/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs
+++ b/Hydraulic/Hydro.CommonBase/Helper/GlobalConfig.cs
@@ -35,15 +35,20 @@
path = value; if (!string.IsNullOrEmpty(path) && path[path.Length - 1] != '\\') path = path + "\\";
}
}
- public static string configPath { get { string p = Path + @"\config\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; }}
- public static string modelPath { get { string p = Path + @"\model\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+ public static string configPath { get { string p = Path + @"config\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; }}
+ public static string modelPath { get { string p = Path + @"model\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
- public static string resultPath { get { string p = Path + @"\result\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+ public static string resultPath { get { string p = Path + @"result\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
- public static string savePath { get { string p = Path + @"\save\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+ public static string savePath { get { string p = Path + @"save\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
- public static string bakPath { get { string p = Path + @"\config_bk\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
- public static string recordPath { get { string p = Path + @"\Record\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+ public static string bakPath { get { string p = Path + @"config_bk\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+ public static string recordPath { get { string p = Path + @"Record\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+
+ public static string ChartFilePath { get { string p = Path + @"Chart\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+
+ public static string BranchPath { get { string p = Path + @"Branch\"; if (!Directory.Exists(p)) Directory.CreateDirectory(p); return p; } }
+
}
public class GlobalConfig
{
--
Gitblit v1.9.3