修复代理商资料无法修改问题与合并以往修改操作

wangsheng

2022-03-22 4e4227f9d9b0c7efc4e4afd2bb371bae9fe6cc03

修复代理商资料无法修改问题与合并以往修改操作

 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" />

 web/.vs/Web/v16/.suo

Binary files differ

 web/App_Code/bin/Debug/App_Code.dll

Binary files differ

 web/App_Code/bin/Debug/App_Code.pdb

Binary files differ

 web/App_Code/bin/Release/App_Code.dll

Binary files differ

 web/App_Code/bin/Release/App_Code.pdb

Binary files differ

 web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache

Binary files differ

 web/App_Code/obj/Debug/App_Code.csproj.CopyComplete

 web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
148a124d533dab517de60d4081ee6b355ffb0769
73d59a519d75fba02045f94dbe09df43d113619d

 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

 web/App_Code/obj/Debug/App_Code.csprojAssemblyReference.cache

Binary files differ

 web/App_Code/obj/Debug/App_Code.dll

Binary files differ

 web/App_Code/obj/Debug/App_Code.pdb

Binary files differ

 web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/App_Code/obj/Debug/Refactor/App_Code.dll

Binary files differ

 web/App_Code/obj/Release/App_Code.csproj.AssemblyReference.cache

Binary files differ

 web/App_Code/obj/Release/App_Code.csproj.CopyComplete

 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

 web/App_Code/obj/Release/App_Code.csprojAssemblyReference.cache

Binary files differ

 web/App_Code/obj/Release/App_Code.dll

Binary files differ

 web/App_Code/obj/Release/App_Code.pdb

Binary files differ

 web/Common/bin/Release/Common.dll

Binary files differ

 web/Common/bin/Release/Common.pdb

Binary files differ

 web/Common/obj/Debug/Common.csproj.AssemblyReference.cache

Binary files differ

 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

 web/Common/obj/Debug/Common.csprojAssemblyReference.cache

Binary files differ

 web/Common/obj/Debug/Common.dll

Binary files differ

 web/Common/obj/Debug/Common.pdb

Binary files differ

 web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/Common/obj/Release/Common.csproj.AssemblyReference.cache

Binary files differ

 web/Common/obj/Release/Common.csproj.CopyComplete

 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

 web/Common/obj/Release/Common.csprojAssemblyReference.cache

Binary files differ

 web/Common/obj/Release/Common.dll

Binary files differ

 web/Common/obj/Release/Common.pdb

Binary files differ

 web/Dao/bin/Release/Common.dll

Binary files differ

 web/Dao/bin/Release/Common.pdb

Binary files differ

 web/Dao/bin/Release/Dao.dll

Binary files differ

 web/Dao/bin/Release/Dao.pdb

Binary files differ

 web/Dao/bin/Release/Model.dll

Binary files differ

 web/Dao/bin/Release/Model.pdb

Binary files differ

 web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache

Binary files differ

 web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
2f4ee5a304a64e1617ed59777b36c0169fa3e828
824b8542c2793ad4f659f2bbdcf31228b48c7d47

 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

 web/Dao/obj/Debug/Dao.csprojAssemblyReference.cache

Binary files differ

 web/Dao/obj/Debug/Dao.dll

Binary files differ

 web/Dao/obj/Debug/Dao.pdb

Binary files differ

 web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/Dao/obj/Debug/Refactor/Dao.dll

Binary files differ

 web/Dao/obj/Debug/ResolveAssemblyReference.cache

Binary files differ

 web/Dao/obj/Release/Dao.csproj.AssemblyReference.cache

Binary files differ

 web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
03ac8fb778df47064b4ab65f28af8408156b7fa4
ffceac74583ffe022717b2538e55c4e28b8e84c0

 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

 web/Dao/obj/Release/Dao.csprojAssemblyReference.cache

Binary files differ

 web/Dao/obj/Release/Dao.dll

Binary files differ

 web/Dao/obj/Release/Dao.pdb

Binary files differ

 web/Dao/obj/Release/build.force

 web/Lib/Common.dll

Binary files differ

 web/Lib/Common.pdb

Binary files differ

 web/Lib/Dao.dll

Binary files differ

 web/Lib/Dao.pdb

Binary files differ

 web/Lib/Model.dll

Binary files differ

 web/Lib/Model.pdb

Binary files differ

 web/Model/bin/Release/Common.dll

Binary files differ

 web/Model/bin/Release/Common.pdb

Binary files differ

 web/Model/bin/Release/Model.dll

Binary files differ

 web/Model/bin/Release/Model.pdb

Binary files differ

 web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/Model/obj/Debug/Model.csproj.AssemblyReference.cache

Binary files differ

 web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
00bfb7d603acc6cb6309f95b0c5c17d4ff8f2b67
fde6d962a77aae709844cba5e3ccabd0c6a77d01

 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

 web/Model/obj/Debug/Model.csprojAssemblyReference.cache

Binary files differ

 web/Model/obj/Debug/Model.dll

Binary files differ

 web/Model/obj/Debug/Model.pdb

Binary files differ

 web/Model/obj/Debug/Refactor/Model.dll

Binary files differ

 web/Model/obj/Debug/ResolveAssemblyReference.cache

Binary files differ

 web/Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
c4762145da2a34560c5dc93e2958bfb07137e5f2
db450e1efa71a4dea326f082acc3fcb64ed72125

 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

 web/Model/obj/Release/Model.csprojAssemblyReference.cache

Binary files differ

 web/Model/obj/Release/Model.dll

Binary files differ

 web/Model/obj/Release/Model.pdb

Binary files differ

 web/UMCLib/bin/Debug/UMCLib.dll

Binary files differ

 web/UMCLib/bin/Debug/UMCLib.pdb

Binary files differ

 web/UMCLib/bin/Release/UMCLib.dll

Binary files differ

 web/UMCLib/bin/Release/UMCLib.pdb

Binary files differ

 web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/UMCLib/obj/Debug/Refactor/UMCLib.dll

Binary files differ

 web/UMCLib/obj/Debug/ResolveAssemblyReference.cache

Binary files differ

 web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache

Binary files differ

 web/UMCLib/obj/Debug/UMCLib.csproj.CopyComplete

 web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
27f9b4fb5d36be9c155fb6557fe17e62c41ec4da
c546f08e5171d2ea11491af4c442ff223c9bb58c

 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

 web/UMCLib/obj/Debug/UMCLib.csprojAssemblyReference.cache

Binary files differ

 web/UMCLib/obj/Debug/UMCLib.dll

Binary files differ

 web/UMCLib/obj/Debug/UMCLib.pdb

Binary files differ

 web/UMCLib/obj/Release/UMCLib.csproj.AssemblyReference.cache

Binary files differ

 web/UMCLib/obj/Release/UMCLib.csproj.CopyComplete

 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

 web/UMCLib/obj/Release/UMCLib.csprojAssemblyReference.cache

Binary files differ

 web/UMCLib/obj/Release/UMCLib.dll

Binary files differ

 web/UMCLib/obj/Release/UMCLib.pdb

Binary files differ

 web/web/Bin/App_Code.dll

Binary files differ

 web/web/Bin/App_Code.pdb

Binary files differ

 web/web/Bin/Common.dll

Binary files differ

 web/web/Bin/Common.pdb

Binary files differ

 web/web/Bin/Dao.dll

Binary files differ

 web/web/Bin/Dao.pdb

Binary files differ

 web/web/Bin/Model.dll

Binary files differ

 web/web/Bin/Model.pdb

Binary files differ

 web/web/Bin/UMCLib.dll

Binary files differ

 web/web/Bin/UMCLib.pdb

Binary files differ

 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)
    {