客户管理分配个性产品优化、返回URL优化

yzh

2022-06-30 a6a84e6f677447342e8c5984fdc0b52241b92ce3

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

@@ -5,3 +5,25 @@
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