Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop

yzh

2022-05-06 d4da5a8fe9dfaa361a98acb14fcd3e9ae00d1689

 web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt

@@ -1,60 +1,17 @@
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
D:\Company\SMGW_NewWeb\web\Lib\Common.dll
D:\Company\SMGW_NewWeb\web\Lib\Common.pdb
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.dll
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.pdb
<<<<<<< HEAD
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Common.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Common.pdb
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