From 11fdf34d61eaaa6b733901907581dec9ac0aef6f Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 13:02:50 +0800
Subject: [PATCH] 删除Debug

---
 /dev/null                           |    0 
 web/UMCLib/bin/Debug/UMCLib.pdb     |    0 
 web/App_Code/bin/Debug/App_Code.pdb |    0 
 web/App_Code/bin/Debug/App_Code.dll |    0 
 web/web/Bin/UMCLib.dll              |    0 
 web/.vs/Web/v16/.suo                |    0 
 web/UMCLib/bin/Debug/UMCLib.dll     |    0 
 7 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index c1a9a98..03b7ed7 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 f2907f5..3a98e52 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 b948e2f..bde19c4 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/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/App_Code/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/App_Code/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
deleted file mode 100644
index 6d524d3..0000000
--- a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache b/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 49fa306..0000000
--- a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-148a124d533dab517de60d4081ee6b355ffb0769
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt b/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
deleted file mode 100644
index 6133d8b..0000000
--- a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-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
-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.dll b/web/App_Code/obj/Debug/App_Code.dll
deleted file mode 100644
index f2907f5..0000000
--- a/web/App_Code/obj/Debug/App_Code.dll
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.pdb b/web/App_Code/obj/Debug/App_Code.pdb
deleted file mode 100644
index b948e2f..0000000
--- a/web/App_Code/obj/Debug/App_Code.pdb
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index fb4e382..0000000
--- a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/App_Code/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/App_Code/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache b/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
deleted file mode 100644
index 4d7ac47..0000000
--- a/web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache b/web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache
deleted file mode 100644
index b95c3a9..0000000
--- a/web/App_Code/obj/Release/App_Code.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-873be3bb4c68603651a642203b3380fde6dd4755
diff --git a/web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt b/web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt
deleted file mode 100644
index 58aeaa0..0000000
--- a/web/App_Code/obj/Release/App_Code.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-D:\Company\SMGW_NewWeb\web\App_Code\bin\Release\Dao.dll
-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.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
-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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Release\App_Code.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Release\App_Code.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Release\Aspose.Cells.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Release\Dao.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\bin\Release\Ionic.Zip.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\App_Code\obj\Release\App_Code.csproj.CoreCompileInputs.cache
-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.dll b/web/App_Code/obj/Release/App_Code.dll
deleted file mode 100644
index 0cfb1c4..0000000
--- a/web/App_Code/obj/Release/App_Code.dll
+++ /dev/null
Binary files differ
diff --git a/web/App_Code/obj/Release/App_Code.pdb b/web/App_Code/obj/Release/App_Code.pdb
deleted file mode 100644
index 315fa9a..0000000
--- a/web/App_Code/obj/Release/App_Code.pdb
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/Common/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/Common/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
deleted file mode 100644
index 9697915..0000000
--- a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache b/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 102e063..0000000
--- a/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-4d2c39d51ee4afe984b12afe838461ebc03c777b
diff --git a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
deleted file mode 100644
index 68f644f..0000000
--- a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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.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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
-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.dll b/web/Common/obj/Debug/Common.dll
deleted file mode 100644
index a695c6b..0000000
--- a/web/Common/obj/Debug/Common.dll
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Debug/Common.pdb b/web/Common/obj/Debug/Common.pdb
deleted file mode 100644
index 1d5053e..0000000
--- a/web/Common/obj/Debug/Common.pdb
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 77d2276..0000000
--- a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/Common/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/Common/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/Common/obj/Release/Common.csproj.AssemblyReference.cache b/web/Common/obj/Release/Common.csproj.AssemblyReference.cache
deleted file mode 100644
index 1bf2744..0000000
--- a/web/Common/obj/Release/Common.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache b/web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache
deleted file mode 100644
index c0253ac..0000000
--- a/web/Common/obj/Release/Common.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-f05064e66538c56da836b03d27148211bdb278f8
diff --git a/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt
deleted file mode 100644
index 700fb04..0000000
--- a/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-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.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
-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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\Common.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\Common.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\log4net.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache
-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.dll b/web/Common/obj/Release/Common.dll
deleted file mode 100644
index c17eeb7..0000000
--- a/web/Common/obj/Release/Common.dll
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Release/Common.pdb b/web/Common/obj/Release/Common.pdb
deleted file mode 100644
index 8cf945b..0000000
--- a/web/Common/obj/Release/Common.pdb
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/Dao/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/Dao/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
deleted file mode 100644
index 48936f7..0000000
--- a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.CopyComplete b/web/Dao/obj/Debug/Dao.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/Dao/obj/Debug/Dao.csproj.CopyComplete
+++ /dev/null
diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 732ea46..0000000
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-0544a4b948cdc93476250066129b440538ad7759
diff --git a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
deleted file mode 100644
index 6a9ca5c..0000000
--- a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-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.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.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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll
deleted file mode 100644
index 3164e3c..0000000
--- a/web/Dao/obj/Debug/Dao.dll
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
deleted file mode 100644
index 49e31d1..0000000
--- a/web/Dao/obj/Debug/Dao.pdb
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 370c349..0000000
--- a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/Dao/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/Dao/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
deleted file mode 100644
index e63d339..0000000
--- a/web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.csproj.CopyComplete b/web/Dao/obj/Release/Dao.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/Dao/obj/Release/Dao.csproj.CopyComplete
+++ /dev/null
diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 2fa7cbb..0000000
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-0c60e0363c7ebe19e617b065424b04ecbc8fd3d6
-=======
-ffceac74583ffe022717b2538e55c4e28b8e84c0
->>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
deleted file mode 100644
index 97b45ea..0000000
--- a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-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
-D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Model.dll
-D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Newtonsoft.Json.dll
-D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Oracle.DataAccess.dll
-D:\Company\SMGW_NewWeb\web\Dao\bin\Release\UMCLib.dll
-D:\Company\SMGW_NewWeb\web\Dao\bin\Release\log4net.dll
-D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Model.pdb
-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
-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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Dao.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Dao.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Common.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Model.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Newtonsoft.Json.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Oracle.DataAccess.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\UMCLib.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\log4net.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Model.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\bin\Release\Common.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CoreCompileInputs.cache
-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.dll b/web/Dao/obj/Release/Dao.dll
deleted file mode 100644
index 90d8df9..0000000
--- a/web/Dao/obj/Release/Dao.dll
+++ /dev/null
Binary files differ
diff --git a/web/Dao/obj/Release/Dao.pdb b/web/Dao/obj/Release/Dao.pdb
deleted file mode 100644
index 3b547a3..0000000
--- a/web/Dao/obj/Release/Dao.pdb
+++ /dev/null
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/Model/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/Model/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/Model/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 8dd191b..0000000
--- a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
deleted file mode 100644
index 0fe5c78..0000000
--- a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.CopyComplete b/web/Model/obj/Debug/Model.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/Model/obj/Debug/Model.csproj.CopyComplete
+++ /dev/null
diff --git a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 237ef06..0000000
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-1bacd091eedbdb18186fe1adccdde3305270d490
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5d0455d..0000000
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-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
-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.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
-=======
->>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
diff --git a/web/Model/obj/Debug/Model.dll b/web/Model/obj/Debug/Model.dll
deleted file mode 100644
index 04bcab3..0000000
--- a/web/Model/obj/Debug/Model.dll
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Debug/Model.pdb b/web/Model/obj/Debug/Model.pdb
deleted file mode 100644
index c28c4a9..0000000
--- a/web/Model/obj/Debug/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/Model/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/Model/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/Model/obj/Release/Model.csproj.AssemblyReference.cache b/web/Model/obj/Release/Model.csproj.AssemblyReference.cache
deleted file mode 100644
index 2c159f5..0000000
--- a/web/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Release/Model.csproj.CopyComplete b/web/Model/obj/Release/Model.csproj.CopyComplete
deleted file mode 100644
index e69de29..0000000
--- a/web/Model/obj/Release/Model.csproj.CopyComplete
+++ /dev/null
diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
deleted file mode 100644
index a0578fb..0000000
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-12e65c17b8944c912c6483c66ed2578caa57f1d2
-=======
-db450e1efa71a4dea326f082acc3fcb64ed72125
->>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
deleted file mode 100644
index 843fe01..0000000
--- a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-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
-D:\Company\SMGW_NewWeb\web\Model\bin\Release\Newtonsoft.Json.dll
-D:\Company\SMGW_NewWeb\web\Model\bin\Release\UMCLib.dll
-D:\Company\SMGW_NewWeb\web\Model\bin\Release\log4net.dll
-D:\Company\SMGW_NewWeb\web\Model\bin\Release\Oracle.DataAccess.dll
-D:\Company\SMGW_NewWeb\web\Model\bin\Release\Common.pdb
-D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
-D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-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
-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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Model.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Model.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Common.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\UMCLib.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\log4net.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Oracle.DataAccess.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Common.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-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.dll b/web/Model/obj/Release/Model.dll
deleted file mode 100644
index 26cc210..0000000
--- a/web/Model/obj/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/web/Model/obj/Release/Model.pdb b/web/Model/obj/Release/Model.pdb
deleted file mode 100644
index af09172..0000000
--- a/web/Model/obj/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.dll b/web/UMCLib/bin/Debug/UMCLib.dll
index 8121779..7d955aa 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 48cc582..9b51360 100644
--- a/web/UMCLib/bin/Debug/UMCLib.pdb
+++ b/web/UMCLib/bin/Debug/UMCLib.pdb
Binary files differ
diff --git a/web/UMCLib/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/UMCLib/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/UMCLib/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 54616eb..0000000
--- a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.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
deleted file mode 100644
index 519d9ba..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 3bf9622..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-27f9b4fb5d36be9c155fb6557fe17e62c41ec4da
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
deleted file mode 100644
index 80184c7..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-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.dll b/web/UMCLib/obj/Debug/UMCLib.dll
deleted file mode 100644
index 8121779..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.dll
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.pdb b/web/UMCLib/obj/Debug/UMCLib.pdb
deleted file mode 100644
index 48cc582..0000000
--- a/web/UMCLib/obj/Debug/UMCLib.pdb
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/web/UMCLib/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/web/UMCLib/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache b/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
deleted file mode 100644
index 2d9e74a..0000000
--- a/web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 7f17e93..0000000
--- a/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-6ff39fd28dd87b6cc010ab534c82ef3efebde7dc
diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
deleted file mode 100644
index a2a81d4..0000000
--- a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-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.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
-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
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
-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.dll b/web/UMCLib/obj/Release/UMCLib.dll
deleted file mode 100644
index 67a8f18..0000000
--- a/web/UMCLib/obj/Release/UMCLib.dll
+++ /dev/null
Binary files differ
diff --git a/web/UMCLib/obj/Release/UMCLib.pdb b/web/UMCLib/obj/Release/UMCLib.pdb
deleted file mode 100644
index fdd37a0..0000000
--- a/web/UMCLib/obj/Release/UMCLib.pdb
+++ /dev/null
Binary files differ
diff --git a/web/web/Bin/UMCLib.dll b/web/web/Bin/UMCLib.dll
index de922c5..7d955aa 100644
--- a/web/web/Bin/UMCLib.dll
+++ b/web/web/Bin/UMCLib.dll
Binary files differ

--
Gitblit v1.9.1