From 4214efaa804bf6f94b28a6db6b099523df9b3252 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 29 四月 2022 16:32:04 +0800
Subject: [PATCH] 充值、充值日志

---
 web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
index 80567bf..62ed5ea 100644
--- a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
@@ -41,3 +41,50 @@
 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
+D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Model.dll
+D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Newtonsoft.Json.dll
+D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Oracle.DataAccess.dll
+D:\Company\SMGW_NewWeb\web\Dao\bin\Release\UMCLib.dll
+D:\Company\SMGW_NewWeb\web\Dao\bin\Release\log4net.dll
+D:\Company\SMGW_NewWeb\web\Dao\bin\Release\Model.pdb
+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.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
+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

--
Gitblit v1.9.1