From d4da5a8fe9dfaa361a98acb14fcd3e9ae00d1689 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:49:28 +0800
Subject: [PATCH] Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop
---
web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt | 81 --------
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache | 4
web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt | 66 ------
web/web/GwAuditCache.ashx | 5
web/Model/obj/Release/Model.csproj.FileListAbsolute.txt | 39 ----
web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache | 2
web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt | 24 --
web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt | 67 -------
web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt | 20 -
web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache | 2
web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/.vs/Web/config/applicationhost.config | 2
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache | 4
web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache | 4
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt | 47 ----
web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt | 77 --------
web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache | 4
/dev/null | 0
web/Common/obj/Release/Common.csproj.FileListAbsolute.txt | 31 ---
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 54 -----
web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache | 0
25 files changed, 47 insertions(+), 486 deletions(-)
diff --git a/web/.vs/Web/config/applicationhost.config b/web/.vs/Web/config/applicationhost.config
index 69793a8..3a3a971 100644
--- a/web/.vs/Web/config/applicationhost.config
+++ b/web/.vs/Web/config/applicationhost.config
@@ -162,7 +162,7 @@
</site>
<site name="web" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
- <virtualDirectory path="/" physicalPath="C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\web" />
+ <virtualDirectory path="/" physicalPath="D:\Company\SMGW_NewWeb\web\web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:60960:localhost" />
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.CopyComplete b/web/App_Code/obj/Debug/App_Code.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/App_Code/obj/Debug/App_Code.csproj.CopyComplete
+++ /dev/null
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache b/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
index 49fa306..933dd95 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
+++ b/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-148a124d533dab517de60d4081ee6b355ffb0769
+73d59a519d75fba02045f94dbe09df43d113619d
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt b/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
index 1ef0c4a..812d105 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
+++ b/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
@@ -1,89 +1,10 @@
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\App_Code\bin\Debug\App_Code.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\App_Code\bin\Debug\App_Code.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\App_Code\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\App_Code\obj\Debug\App_Code.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\App_Code\obj\Debug\App_Code.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\App_Code\bin\Debug\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\App_Code\bin\Debug\App_Code.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\App_Code\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\App_Code\obj\Debug\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\App_Code\obj\Debug\App_Code.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\App_Code.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\App_Code.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\Aspose.Cells.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\Dao.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\Ionic.Zip.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.csprojAssemblyReference.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\App_Code.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\App_Code.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\Aspose.Cells.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\Dao.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\bin\Debug\Ionic.Zip.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.csprojAssemblyReference.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\App_Code\obj\Debug\App_Code.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Debug\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Debug\App_Code.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Debug\Aspose.Cells.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Debug\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Debug\Ionic.Zip.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Debug\App_Code.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Debug\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Debug\App_Code.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\App_Code.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\Aspose.Cells.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\Ionic.Zip.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\App_Code.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\App_Code.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\Aspose.Cells.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Debug\Ionic.Zip.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Debug\Aspose.Cells.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Debug\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Debug\Ionic.Zip.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.pdb
D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.dll
D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.pdb
D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\Aspose.Cells.dll
D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\Dao.dll
D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\Ionic.Zip.dll
+D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.dll
D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.pdb
-D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Debug\Aspose.Cells.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Debug\Dao.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Debug\Ionic.Zip.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.pdb
diff --git a/web/App_Code/obj/Debug/App_Code.csprojAssemblyReference.cache b/web/App_Code/obj/Debug/App_Code.csprojAssemblyReference.cache
deleted file mode 100644
index 939e930..0000000
--- a/web/App_Code/obj/Debug/App_Code.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 8d4b15d..fb4e382 100644
--- a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/App_Code/obj/Debug/Refactor/App_Code.dll b/web/App_Code/obj/Debug/Refactor/App_Code.dll
deleted file mode 100644
index d8bb857..0000000
--- a/web/App_Code/obj/Debug/Refactor/App_Code.dll
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Release/App_Code.csproj.CopyComplete b/web/App_Code/obj/Release/App_Code.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/App_Code/obj/Release/App_Code.csproj.CopyComplete
+++ /dev/null
diff --git a/web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt b/web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt
index 6be79b4..58aeaa0 100644
--- a/web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt
+++ b/web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt
@@ -1,23 +1,3 @@
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Release\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Release\App_Code.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Release\Aspose.Cells.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Release\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\bin\Release\Ionic.Zip.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Release\App_Code.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Release\App_Code.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Release\App_Code.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Release\App_Code.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\App_Code\obj\Release\App_Code.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Release\App_Code.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Release\App_Code.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Release\Aspose.Cells.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Release\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\bin\Release\Ionic.Zip.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Release\App_Code.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Release\App_Code.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Release\App_Code.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Release\App_Code.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Release\App_Code.pdb
D:\Company\SMGW_NewWeb\web\App_Code\bin\Release\App_Code.dll
D:\Company\SMGW_NewWeb\web\App_Code\bin\Release\App_Code.pdb
D:\Company\SMGW_NewWeb\web\App_Code\bin\Release\Aspose.Cells.dll
@@ -25,9 +5,9 @@
D:\Company\SMGW_NewWeb\web\App_Code\bin\Release\Ionic.Zip.dll
D:\Company\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.CoreCompileInputs.cache
-D:\Company\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.dll
D:\Company\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.pdb
+<<<<<<< HEAD
<<<<<<< Updated upstream
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Release\App_Code.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Release\App_Code.pdb
@@ -51,3 +31,5 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/App_Code/obj/Release/App_Code.csprojAssemblyReference.cache b/web/App_Code/obj/Release/App_Code.csprojAssemblyReference.cache
deleted file mode 100644
index e8ebfdd..0000000
--- a/web/App_Code/obj/Release/App_Code.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
index a81ee13..68f644f 100644
--- a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
+++ b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
@@ -1,70 +1,10 @@
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Common\bin\Debug\Common.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Common\bin\Debug\Common.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Common\bin\Debug\log4net.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Common\bin\Debug\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Common\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Common\obj\Debug\Common.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Common\obj\Debug\Common.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Common\bin\Debug\Common.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Common\bin\Debug\Common.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Common\bin\Debug\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Common\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Common\obj\Debug\Common.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Common\obj\Debug\Common.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\Common.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\Common.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\log4net.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\Oracle.DataAccess.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.csprojAssemblyReference.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.csproj.CopyComplete
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\Common.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\Common.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\log4net.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\bin\Debug\Oracle.DataAccess.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.csprojAssemblyReference.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.csproj.CopyComplete
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\Common\obj\Debug\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Debug\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Debug\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Debug\log4net.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Debug\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Debug\Common.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Debug\Common.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Debug\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Debug\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Lib\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Lib\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.csprojAssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Lib\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Lib\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Debug\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Debug\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Debug\Common.pdb
D:\Company\SMGW_NewWeb\web\Lib\Common.dll
D:\Company\SMGW_NewWeb\web\Lib\Common.pdb
+D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.dll
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.pdb
+<<<<<<< HEAD
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Common.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Common.pdb
@@ -73,3 +13,5 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Debug\Common.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Debug\Common.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Common/obj/Debug/Common.csprojAssemblyReference.cache b/web/Common/obj/Debug/Common.csprojAssemblyReference.cache
deleted file mode 100644
index fa086f3..0000000
--- a/web/Common/obj/Debug/Common.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d1a2046..77d2276 100644
--- a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Common/obj/Release/Common.csproj.CopyComplete b/web/Common/obj/Release/Common.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/Common/obj/Release/Common.csproj.CopyComplete
+++ /dev/null
diff --git a/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt
index 7eb4c74..700fb04 100644
--- a/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt
+++ b/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt
@@ -1,39 +1,12 @@
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\log4net.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\log4net.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\log4net.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.pdb
D:\Company\SMGW_NewWeb\web\Common\bin\Release\Common.dll
D:\Company\SMGW_NewWeb\web\Common\bin\Release\Common.pdb
D:\Company\SMGW_NewWeb\web\Common\bin\Release\log4net.dll
D:\Company\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll
D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache
-D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.dll
D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.pdb
+<<<<<<< HEAD
<<<<<<< Updated upstream
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Common.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Common.pdb
@@ -55,3 +28,5 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Common/obj/Release/Common.csprojAssemblyReference.cache b/web/Common/obj/Release/Common.csprojAssemblyReference.cache
deleted file mode 100644
index 631864e..0000000
--- a/web/Common/obj/Release/Common.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index 732ea46..29568ad 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
0544a4b948cdc93476250066129b440538ad7759
+=======
+824b8542c2793ad4f659f2bbdcf31228b48c7d47
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
index 2976f19..bc7d534 100644
--- a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
@@ -1,82 +1,7 @@
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Dao.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Dao.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Common.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Model.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Model.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\obj\Debug\Dao.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Dao\obj\Debug\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Dao.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Common.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Model.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\bin\Debug\Model.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\obj\Debug\Dao.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Dao\obj\Debug\Dao.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\Dao.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\Dao.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\Common.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\Model.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\Newtonsoft.Json.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\Oracle.DataAccess.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\UMCLib.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\bin\Debug\Model.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\obj\Debug\Dao.csprojAssemblyReference.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\obj\Debug\Dao.csproj.CopyComplete
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\obj\Debug\Dao.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Dao\obj\Debug\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Debug\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Debug\Dao.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Debug\Dao.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Debug\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Debug\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Lib\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Lib\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Lib\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Lib\Dao.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Dao.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
+D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Lib\Dao.dll
D:\Company\SMGW_NewWeb\web\Lib\Dao.pdb
-D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Dao.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Dao.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
diff --git a/web/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/web/Dao/obj/Debug/Dao.csprojAssemblyReference.cache
deleted file mode 100644
index 34c99de..0000000
--- a/web/Dao/obj/Debug/Dao.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 370c349..d3bed3f 100644
--- a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/Refactor/Dao.dll b/web/Dao/obj/Debug/Refactor/Dao.dll
deleted file mode 100644
index d2ccab4..0000000
--- a/web/Dao/obj/Debug/Refactor/Dao.dll
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Debug/ResolveAssemblyReference.cache b/web/Dao/obj/Debug/ResolveAssemblyReference.cache
deleted file mode 100644
index c38ac21..0000000
--- a/web/Dao/obj/Debug/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 89d1d3d..2fa7cbb 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
0c60e0363c7ebe19e617b065424b04ecbc8fd3d6
+=======
+ffceac74583ffe022717b2538e55c4e28b8e84c0
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
index 62ed5ea..97b45ea 100644
--- a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
@@ -1,46 +1,3 @@
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\bin\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Release\Dao.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Release\Dao.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Release\Dao.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Release\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Dao\obj\Release\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Dao.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\log4net.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\bin\Release\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Dao.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\log4net.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\bin\Release\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Release\Dao.pdb
D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Dao.dll
D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Dao.pdb
D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Common.dll
@@ -53,8 +10,10 @@
D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Common.pdb
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CoreCompileInputs.cache
+D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.dll
D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.pdb
+<<<<<<< HEAD
<<<<<<< Updated upstream
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Dao.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Dao.pdb
@@ -88,3 +47,5 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Release\Dao.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Release\Dao.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Dao/obj/Release/Dao.csprojAssemblyReference.cache b/web/Dao/obj/Release/Dao.csprojAssemblyReference.cache
deleted file mode 100644
index 7e8ba20..0000000
--- a/web/Dao/obj/Release/Dao.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 42e31cc..8dd191b 100644
--- a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index 237ef06..7a65625 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
1bacd091eedbdb18186fe1adccdde3305270d490
+=======
+fde6d962a77aae709844cba5e3ccabd0c6a77d01
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index 3406e32..cd59082 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -1,57 +1,11 @@
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\bin\Debug\Model.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\bin\Debug\Model.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\bin\Debug\Common.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Lib\Model.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Lib\Model.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\obj\Debug\Model.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\Model\obj\Debug\Model.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Lib\Model.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Lib\Model.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Model\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Model\obj\Debug\Model.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\Model\obj\Debug\Model.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Lib\Model.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Lib\Model.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Model\obj\Debug\Model.csprojAssemblyReference.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Model\obj\Debug\Model.csproj.CopyComplete
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Model\obj\Debug\Model.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\Model\obj\Debug\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Lib\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Lib\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Debug\Model.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Debug\Model.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Debug\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Debug\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Lib\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Lib\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Lib\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Lib\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Lib\Model.dll
D:\Company\SMGW_NewWeb\web\Lib\Model.pdb
+D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
+D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
+<<<<<<< HEAD
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Model.dll
@@ -60,3 +14,5 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Model/obj/Debug/Model.csprojAssemblyReference.cache b/web/Model/obj/Debug/Model.csprojAssemblyReference.cache
deleted file mode 100644
index f5bb0f6..0000000
--- a/web/Model/obj/Debug/Model.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Debug/Refactor/Model.dll b/web/Model/obj/Debug/Refactor/Model.dll
deleted file mode 100644
index 02ce4af..0000000
--- a/web/Model/obj/Debug/Refactor/Model.dll
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Debug/ResolveAssemblyReference.cache b/web/Model/obj/Debug/ResolveAssemblyReference.cache
deleted file mode 100644
index 95df595..0000000
--- a/web/Model/obj/Debug/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index 57e5d3c..a0578fb 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
12e65c17b8944c912c6483c66ed2578caa57f1d2
+=======
+db450e1efa71a4dea326f082acc3fcb64ed72125
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
index 701dd21..843fe01 100644
--- a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
@@ -1,39 +1,3 @@
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\log4net.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\log4net.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.pdb
D:\Company\SMGW_NewWeb\web\Model\bin\Release\Model.dll
D:\Company\SMGW_NewWeb\web\Model\bin\Release\Model.pdb
D:\Company\SMGW_NewWeb\web\Model\bin\Release\Common.dll
@@ -47,6 +11,7 @@
D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.dll
D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
+<<<<<<< HEAD
<<<<<<< Updated upstream
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Model.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Model.pdb
@@ -76,3 +41,5 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Model/obj/Release/Model.csprojAssemblyReference.cache b/web/Model/obj/Release/Model.csprojAssemblyReference.cache
deleted file mode 100644
index eaf6a8c..0000000
--- a/web/Model/obj/Release/Model.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 4b3948e..54616eb 100644
--- a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/UMCLib/obj/Debug/Refactor/UMCLib.dll b/web/UMCLib/obj/Debug/Refactor/UMCLib.dll
deleted file mode 100644
index 187f03a..0000000
--- a/web/UMCLib/obj/Debug/Refactor/UMCLib.dll
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Debug/ResolveAssemblyReference.cache b/web/UMCLib/obj/Debug/ResolveAssemblyReference.cache
deleted file mode 100644
index afc1b05..0000000
--- a/web/UMCLib/obj/Debug/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.CopyComplete b/web/UMCLib/obj/Debug/UMCLib.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.CopyComplete
+++ /dev/null
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
index 3bf9622..40c0a9e 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-27f9b4fb5d36be9c155fb6557fe17e62c41ec4da
+c546f08e5171d2ea11491af4c442ff223c9bb58c
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
index 9c5c17e..9f816a9 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
@@ -1,73 +1,8 @@
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csprojAssemblyReference.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csprojAssemblyReference.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
-D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
diff --git a/web/UMCLib/obj/Debug/UMCLib.csprojAssemblyReference.cache b/web/UMCLib/obj/Debug/UMCLib.csprojAssemblyReference.cache
deleted file mode 100644
index ae20ca8..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.CopyComplete b/web/UMCLib/obj/Release/UMCLib.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/UMCLib/obj/Release/UMCLib.csproj.CopyComplete
+++ /dev/null
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
index 9d69a19..a2a81d4 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
@@ -1,27 +1,11 @@
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Release\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Release\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.pdb
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
-D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
+<<<<<<< HEAD
<<<<<<< Updated upstream
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
@@ -41,3 +25,5 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/UMCLib/obj/Release/UMCLib.csprojAssemblyReference.cache b/web/UMCLib/obj/Release/UMCLib.csprojAssemblyReference.cache
deleted file mode 100644
index 954a0c0..0000000
--- a/web/UMCLib/obj/Release/UMCLib.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/web/GwAuditCache.ashx b/web/web/GwAuditCache.ashx
index c289978..af115f6 100644
--- a/web/web/GwAuditCache.ashx
+++ b/web/web/GwAuditCache.ashx
@@ -11,11 +11,6 @@
public class GwAuditCacheHandler : PageHandler<SysUser>
{
-
-
- //cessssssssssssssssss
-
-
private GwSpDao _Dao = new GwSpDao();
public override JsonPageResult ProcessRequestInternal(PageContext<SysUser> context)
{
--
Gitblit v1.9.1