From 4e4227f9d9b0c7efc4e4afd2bb371bae9fe6cc03 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 10:11:10 +0800
Subject: [PATCH] 修复代理商资料无法修改问题与合并以往修改操作
---
web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt | 81 --------
web/Dao/bin/Release/Dao.pdb | 0
web/Common/obj/Debug/Common.csproj.AssemblyReference.cache | 0
web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt | 61 ------
web/App_Code/obj/Release/App_Code.dll | 0
web/Dao/bin/Release/Dao.dll | 0
web/Model/obj/Debug/Model.pdb | 0
web/Model/bin/Release/Model.dll | 0
web/App_Code/obj/Debug/App_Code.dll | 0
web/Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
web/Model/obj/Release/Model.csproj.FileListAbsolute.txt | 52 -----
web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt | 70 -------
web/App_Code/obj/Release/App_Code.pdb | 0
web/Dao/obj/Debug/Dao.dll | 0
web/Model/obj/Debug/Model.dll | 0
web/web/Bin/Common.dll | 0
web/Common/bin/Release/Common.pdb | 0
web/Model/bin/Release/Model.pdb | 0
web/UMCLib/bin/Release/UMCLib.dll | 0
web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache | 2
web/.vs/Web/config/applicationhost.config | 2
web/App_Code/bin/Debug/App_Code.pdb | 0
web/UMCLib/obj/Release/UMCLib.pdb | 0
web/Common/obj/Debug/Common.pdb | 0
web/web/Bin/Common.pdb | 0
web/App_Code/bin/Release/App_Code.dll | 0
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Common/obj/Release/Common.pdb | 0
web/UMCLib/bin/Release/UMCLib.pdb | 0
web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Dao/bin/Release/Model.pdb | 0
web/Dao/obj/Debug/Dao.pdb | 0
web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache | 2
web/Lib/Dao.dll | 0
web/App_Code/bin/Debug/App_Code.dll | 0
web/.vs/Web/v16/.suo | 0
web/Dao/obj/Release/Dao.pdb | 0
web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache | 0
web/Common/obj/Release/Common.dll | 0
web/Model/obj/Release/Model.pdb | 0
web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache | 0
web/Common/obj/Release/Common.csproj.FileListAbsolute.txt | 40 ----
web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache | 0
web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/UMCLib/obj/Release/UMCLib.dll | 0
web/Dao/obj/Release/Dao.dll | 0
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache | 0
web/Lib/Dao.pdb | 0
web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache | 0
web/web/Bin/Dao.dll | 0
web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache | 0
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache | 2
web/web/GwAuditCache.ashx | 5
web/Model/obj/Release/Model.dll | 0
web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache | 2
web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt | 34 ---
web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Common/obj/Debug/Common.dll | 0
web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt | 28 --
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache | 0
web/Lib/Model.dll | 0
web/web/Bin/App_Code.pdb | 0
web/App_Code/bin/Release/App_Code.pdb | 0
web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Dao/bin/Release/Model.dll | 0
web/UMCLib/obj/Debug/UMCLib.dll | 0
web/web/Bin/Dao.pdb | 0
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache | 2
web/UMCLib/bin/Debug/UMCLib.pdb | 0
web/web/Bin/App_Code.dll | 0
web/web/Bin/UMCLib.pdb | 0
web/Dao/bin/Release/Common.dll | 0
web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache | 2
web/Model/bin/Release/Common.dll | 0
web/Lib/Common.dll | 0
web/App_Code/obj/Debug/App_Code.pdb | 0
web/Common/bin/Release/Common.dll | 0
web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt | 63 ------
web/UMCLib/obj/Debug/UMCLib.pdb | 0
web/Lib/Model.pdb | 0
web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt | 77 -------
web/Model/bin/Release/Common.pdb | 0
/dev/null | 0
web/Lib/Common.pdb | 0
web/web/Bin/Model.pdb | 0
web/web/Bin/UMCLib.dll | 0
web/UMCLib/bin/Debug/UMCLib.dll | 0
web/Dao/bin/Release/Common.pdb | 0
web/Common/obj/Release/Common.csproj.AssemblyReference.cache | 0
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 66 ------
web/web/Bin/Model.dll | 0
91 files changed, 11 insertions(+), 580 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/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index ef06ae6..9ae0fc2 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/App_Code/bin/Debug/App_Code.dll b/web/App_Code/bin/Debug/App_Code.dll
index 0ae1362..ea93766 100644
--- a/web/App_Code/bin/Debug/App_Code.dll
+++ b/web/App_Code/bin/Debug/App_Code.dll
Binary files differ
diff --git a/web/App_Code/bin/Debug/App_Code.pdb b/web/App_Code/bin/Debug/App_Code.pdb
index fc59863..c76252e 100644
--- a/web/App_Code/bin/Debug/App_Code.pdb
+++ b/web/App_Code/bin/Debug/App_Code.pdb
Binary files differ
diff --git a/web/App_Code/bin/Release/App_Code.dll b/web/App_Code/bin/Release/App_Code.dll
index 4563dce..4d0a015 100644
--- a/web/App_Code/bin/Release/App_Code.dll
+++ b/web/App_Code/bin/Release/App_Code.dll
Binary files differ
diff --git a/web/App_Code/bin/Release/App_Code.pdb b/web/App_Code/bin/Release/App_Code.pdb
index 835d4e7..24d981d 100644
--- a/web/App_Code/bin/Release/App_Code.pdb
+++ b/web/App_Code/bin/Release/App_Code.pdb
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
index 7ff8fee..e81bd7e 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
+++ b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
Binary files differ
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..3548d5a 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,8 @@
-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.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/App_Code.dll b/web/App_Code/obj/Debug/App_Code.dll
index 0ae1362..ea93766 100644
--- a/web/App_Code/obj/Debug/App_Code.dll
+++ b/web/App_Code/obj/Debug/App_Code.dll
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.pdb b/web/App_Code/obj/Debug/App_Code.pdb
index fc59863..c76252e 100644
--- a/web/App_Code/obj/Debug/App_Code.pdb
+++ b/web/App_Code/obj/Debug/App_Code.pdb
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.AssemblyReference.cache b/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
index 5cda5a2..408dd70 100644
--- a/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
+++ b/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
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 797ac7a..627c1ec 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,19 +5,5 @@
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
-<<<<<<< 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
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Release\Aspose.Cells.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Release\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\bin\Release\Ionic.Zip.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.pdb
-=======
->>>>>>> Stashed changes
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/App_Code/obj/Release/App_Code.dll b/web/App_Code/obj/Release/App_Code.dll
index 4563dce..4d0a015 100644
--- a/web/App_Code/obj/Release/App_Code.dll
+++ b/web/App_Code/obj/Release/App_Code.dll
Binary files differ
diff --git a/web/App_Code/obj/Release/App_Code.pdb b/web/App_Code/obj/Release/App_Code.pdb
index 835d4e7..24d981d 100644
--- a/web/App_Code/obj/Release/App_Code.pdb
+++ b/web/App_Code/obj/Release/App_Code.pdb
Binary files differ
diff --git a/web/Common/bin/Release/Common.dll b/web/Common/bin/Release/Common.dll
index a0c329f..e5121b7 100644
--- a/web/Common/bin/Release/Common.dll
+++ b/web/Common/bin/Release/Common.dll
Binary files differ
diff --git a/web/Common/bin/Release/Common.pdb b/web/Common/bin/Release/Common.pdb
index db03453..cade5ca 100644
--- a/web/Common/bin/Release/Common.pdb
+++ b/web/Common/bin/Release/Common.pdb
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
index c103d0e..80aa8d5 100644
--- a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
+++ b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
index e7f6182..254eb22 100644
--- a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
+++ b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
@@ -1,64 +1,3 @@
-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
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/Common.dll b/web/Common/obj/Debug/Common.dll
index 8b41c8b..5b107cc 100644
--- a/web/Common/obj/Debug/Common.dll
+++ b/web/Common/obj/Debug/Common.dll
Binary files differ
diff --git a/web/Common/obj/Debug/Common.pdb b/web/Common/obj/Debug/Common.pdb
index 1b8d6a3..07740cf 100644
--- a/web/Common/obj/Debug/Common.pdb
+++ b/web/Common/obj/Debug/Common.pdb
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.AssemblyReference.cache b/web/Common/obj/Release/Common.csproj.AssemblyReference.cache
index dec21a9..bd6770d 100644
--- a/web/Common/obj/Release/Common.csproj.AssemblyReference.cache
+++ b/web/Common/obj/Release/Common.csproj.AssemblyReference.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 60323db..1ef098c 100644
--- a/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt
+++ b/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt
@@ -1,48 +1,8 @@
-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
-<<<<<<< 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
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\log4net.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.pdb
-=======
->>>>>>> Stashed changes
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/Common/obj/Release/Common.dll b/web/Common/obj/Release/Common.dll
index a0c329f..e5121b7 100644
--- a/web/Common/obj/Release/Common.dll
+++ b/web/Common/obj/Release/Common.dll
Binary files differ
diff --git a/web/Common/obj/Release/Common.pdb b/web/Common/obj/Release/Common.pdb
index db03453..cade5ca 100644
--- a/web/Common/obj/Release/Common.pdb
+++ b/web/Common/obj/Release/Common.pdb
Binary files differ
diff --git a/web/Dao/bin/Release/Common.dll b/web/Dao/bin/Release/Common.dll
index 8b41c8b..5b107cc 100644
--- a/web/Dao/bin/Release/Common.dll
+++ b/web/Dao/bin/Release/Common.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Common.pdb b/web/Dao/bin/Release/Common.pdb
index 1b8d6a3..07740cf 100644
--- a/web/Dao/bin/Release/Common.pdb
+++ b/web/Dao/bin/Release/Common.pdb
Binary files differ
diff --git a/web/Dao/bin/Release/Dao.dll b/web/Dao/bin/Release/Dao.dll
index 1b5ec1a..006d5f7 100644
--- a/web/Dao/bin/Release/Dao.dll
+++ b/web/Dao/bin/Release/Dao.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Dao.pdb b/web/Dao/bin/Release/Dao.pdb
index 36371d5..94a2c87 100644
--- a/web/Dao/bin/Release/Dao.pdb
+++ b/web/Dao/bin/Release/Dao.pdb
Binary files differ
diff --git a/web/Dao/bin/Release/Model.dll b/web/Dao/bin/Release/Model.dll
index 06fb9ea..009dbb4 100644
--- a/web/Dao/bin/Release/Model.dll
+++ b/web/Dao/bin/Release/Model.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Model.pdb b/web/Dao/bin/Release/Model.pdb
index 614b61a..0fc13e8 100644
--- a/web/Dao/bin/Release/Model.pdb
+++ b/web/Dao/bin/Release/Model.pdb
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index f5e894a..ce642d5 100644
--- a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index 3d7058c..7c49d69 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2f4ee5a304a64e1617ed59777b36c0169fa3e828
+824b8542c2793ad4f659f2bbdcf31228b48c7d47
diff --git a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
index 2976f19..58f442d 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.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.CoreCompileInputs.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/Dao.dll b/web/Dao/obj/Debug/Dao.dll
index fc4c290..d2a2cd8 100644
--- a/web/Dao/obj/Debug/Dao.dll
+++ b/web/Dao/obj/Debug/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
index 0c52201..52cd088 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
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.AssemblyReference.cache b/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
index c7c0395..254fb0a 100644
--- a/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 9b16cba..cdcfe7b 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-03ac8fb778df47064b4ab65f28af8408156b7fa4
+ffceac74583ffe022717b2538e55c4e28b8e84c0
diff --git a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
index 7c6f6b2..d09d30a 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,24 +10,6 @@
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
-<<<<<<< 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
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\log4net.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\bin\Release\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Release\Dao.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Release\Dao.pdb
-=======
->>>>>>> Stashed changes
-D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CopyComplete
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/Dao/obj/Release/Dao.dll b/web/Dao/obj/Release/Dao.dll
index 1b5ec1a..006d5f7 100644
--- a/web/Dao/obj/Release/Dao.dll
+++ b/web/Dao/obj/Release/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.pdb b/web/Dao/obj/Release/Dao.pdb
index 36371d5..94a2c87 100644
--- a/web/Dao/obj/Release/Dao.pdb
+++ b/web/Dao/obj/Release/Dao.pdb
Binary files differ
diff --git a/web/Dao/obj/Release/build.force b/web/Dao/obj/Release/build.force
deleted file mode 100644
index e69de29..0000000
--- a/web/Dao/obj/Release/build.force
+++ /dev/null
diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll
index 8b41c8b..5b107cc 100644
--- a/web/Lib/Common.dll
+++ b/web/Lib/Common.dll
Binary files differ
diff --git a/web/Lib/Common.pdb b/web/Lib/Common.pdb
index 1b8d6a3..07740cf 100644
--- a/web/Lib/Common.pdb
+++ b/web/Lib/Common.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index fc4c290..d2a2cd8 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 0c52201..52cd088 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index a770e4c..66ea848 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index b4cc7cc..27944d9 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/bin/Release/Common.dll b/web/Model/bin/Release/Common.dll
index 8b41c8b..5b107cc 100644
--- a/web/Model/bin/Release/Common.dll
+++ b/web/Model/bin/Release/Common.dll
Binary files differ
diff --git a/web/Model/bin/Release/Common.pdb b/web/Model/bin/Release/Common.pdb
index 1b8d6a3..07740cf 100644
--- a/web/Model/bin/Release/Common.pdb
+++ b/web/Model/bin/Release/Common.pdb
Binary files differ
diff --git a/web/Model/bin/Release/Model.dll b/web/Model/bin/Release/Model.dll
index 06fb9ea..009dbb4 100644
--- a/web/Model/bin/Release/Model.dll
+++ b/web/Model/bin/Release/Model.dll
Binary files differ
diff --git a/web/Model/bin/Release/Model.pdb b/web/Model/bin/Release/Model.pdb
index 614b61a..0fc13e8 100644
--- a/web/Model/bin/Release/Model.pdb
+++ b/web/Model/bin/Release/Model.pdb
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
index f5e894a..d2e714f 100644
--- a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
+++ 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 43635fb..5ec708a 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-00bfb7d603acc6cb6309f95b0c5c17d4ff8f2b67
+fde6d962a77aae709844cba5e3ccabd0c6a77d01
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index 2242b5d..ffc22be 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -1,69 +1,7 @@
-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
-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
-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.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
-<<<<<<< HEAD
-D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
-=======
-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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Model.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
-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
->>>>>>> a0bd27679af9591b30aec311b2e7ad4c1ef7357d
+D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
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/Model.dll b/web/Model/obj/Debug/Model.dll
index a770e4c..66ea848 100644
--- a/web/Model/obj/Debug/Model.dll
+++ b/web/Model/obj/Debug/Model.dll
Binary files differ
diff --git a/web/Model/obj/Debug/Model.pdb b/web/Model/obj/Debug/Model.pdb
index b4cc7cc..27944d9 100644
--- a/web/Model/obj/Debug/Model.pdb
+++ b/web/Model/obj/Debug/Model.pdb
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.AssemblyReference.cache b/web/Model/obj/Release/Model.csproj.AssemblyReference.cache
index eb259f3..18bc2e0 100644
--- a/web/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/web/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index ae80e02..2520360 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-c4762145da2a34560c5dc93e2958bfb07137e5f2
+db450e1efa71a4dea326f082acc3fcb64ed72125
diff --git a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
index baa5c80..985c332 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,19 +11,3 @@
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
-<<<<<<< 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
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\log4net.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
-=======
->>>>>>> Stashed changes
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/Model/obj/Release/Model.dll b/web/Model/obj/Release/Model.dll
index 06fb9ea..009dbb4 100644
--- a/web/Model/obj/Release/Model.dll
+++ b/web/Model/obj/Release/Model.dll
Binary files differ
diff --git a/web/Model/obj/Release/Model.pdb b/web/Model/obj/Release/Model.pdb
index 614b61a..0fc13e8 100644
--- a/web/Model/obj/Release/Model.pdb
+++ b/web/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.dll b/web/UMCLib/bin/Debug/UMCLib.dll
index 2da7ac2..cefc539 100644
--- a/web/UMCLib/bin/Debug/UMCLib.dll
+++ b/web/UMCLib/bin/Debug/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.pdb b/web/UMCLib/bin/Debug/UMCLib.pdb
index 2788a05..69c36f5 100644
--- a/web/UMCLib/bin/Debug/UMCLib.pdb
+++ b/web/UMCLib/bin/Debug/UMCLib.pdb
Binary files differ
diff --git a/web/UMCLib/bin/Release/UMCLib.dll b/web/UMCLib/bin/Release/UMCLib.dll
index c4dccfe..7d46199 100644
--- a/web/UMCLib/bin/Release/UMCLib.dll
+++ b/web/UMCLib/bin/Release/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/bin/Release/UMCLib.pdb b/web/UMCLib/bin/Release/UMCLib.pdb
index 015c9a8..b6236b7 100644
--- a/web/UMCLib/bin/Release/UMCLib.pdb
+++ b/web/UMCLib/bin/Release/UMCLib.pdb
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.AssemblyReference.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
index a860b0a..eb08f64 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
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 4f743b7..d135d1e 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
@@ -1,77 +1,7 @@
-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
-<<<<<<< HEAD
-=======
-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
->>>>>>> a0bd27679af9591b30aec311b2e7ad4c1ef7357d
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/Debug/UMCLib.dll b/web/UMCLib/obj/Debug/UMCLib.dll
index 2da7ac2..cefc539 100644
--- a/web/UMCLib/obj/Debug/UMCLib.dll
+++ b/web/UMCLib/obj/Debug/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.pdb b/web/UMCLib/obj/Debug/UMCLib.pdb
index 2788a05..69c36f5 100644
--- a/web/UMCLib/obj/Debug/UMCLib.pdb
+++ b/web/UMCLib/obj/Debug/UMCLib.pdb
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache b/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
index 36fd90a..4256499 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
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 ef8d5a0..25ae494 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
@@ -1,35 +1,7 @@
-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
-<<<<<<< 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
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
-=======
->>>>>>> Stashed changes
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/UMCLib/obj/Release/UMCLib.dll b/web/UMCLib/obj/Release/UMCLib.dll
index c4dccfe..7d46199 100644
--- a/web/UMCLib/obj/Release/UMCLib.dll
+++ b/web/UMCLib/obj/Release/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.pdb b/web/UMCLib/obj/Release/UMCLib.pdb
index 015c9a8..b6236b7 100644
--- a/web/UMCLib/obj/Release/UMCLib.pdb
+++ b/web/UMCLib/obj/Release/UMCLib.pdb
Binary files differ
diff --git a/web/web/Bin/App_Code.dll b/web/web/Bin/App_Code.dll
index 4563dce..4d0a015 100644
--- a/web/web/Bin/App_Code.dll
+++ b/web/web/Bin/App_Code.dll
Binary files differ
diff --git a/web/web/Bin/App_Code.pdb b/web/web/Bin/App_Code.pdb
index 835d4e7..24d981d 100644
--- a/web/web/Bin/App_Code.pdb
+++ b/web/web/Bin/App_Code.pdb
Binary files differ
diff --git a/web/web/Bin/Common.dll b/web/web/Bin/Common.dll
index 8b41c8b..5b107cc 100644
--- a/web/web/Bin/Common.dll
+++ b/web/web/Bin/Common.dll
Binary files differ
diff --git a/web/web/Bin/Common.pdb b/web/web/Bin/Common.pdb
index 1b8d6a3..07740cf 100644
--- a/web/web/Bin/Common.pdb
+++ b/web/web/Bin/Common.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index fc4c290..006d5f7 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 0c52201..94a2c87 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll
index a770e4c..009dbb4 100644
--- a/web/web/Bin/Model.dll
+++ b/web/web/Bin/Model.dll
Binary files differ
diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb
index b4cc7cc..0fc13e8 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/Bin/UMCLib.dll b/web/web/Bin/UMCLib.dll
index de922c5..7d46199 100644
--- a/web/web/Bin/UMCLib.dll
+++ b/web/web/Bin/UMCLib.dll
Binary files differ
diff --git a/web/web/Bin/UMCLib.pdb b/web/web/Bin/UMCLib.pdb
index 015c9a8..b6236b7 100644
--- a/web/web/Bin/UMCLib.pdb
+++ b/web/web/Bin/UMCLib.pdb
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