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

yzh

2022-05-06 d4da5a8fe9dfaa361a98acb14fcd3e9ae00d1689

 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
@@ -56,6 +13,8 @@
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
@@ -71,3 +30,22 @@
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