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

wangsheng

2022-03-01 a89e6ba4b31d13e437d04146490ba8f1c299da08

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

@@ -34,6 +34,7 @@
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
@@ -43,3 +44,5 @@
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