From 07ac2c7ec9680f936a4393b923785242b799daa0 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期二, 10 五月 2022 15:01:37 +0800
Subject: [PATCH] 充值功能优化，客户表增加余额、订单表增加充值金额

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

diff --git a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
index 985c332..843fe01 100644
--- a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
@@ -11,3 +11,35 @@
 D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
 D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.dll
 D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
+<<<<<<< HEAD
+<<<<<<< Updated upstream
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Model.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Model.pdb
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Common.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Newtonsoft.Json.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\UMCLib.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\log4net.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Oracle.DataAccess.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Common.pdb
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
+=======
+>>>>>>> Stashed changes
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Model.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Model.pdb
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Common.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Newtonsoft.Json.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\UMCLib.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\log4net.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Oracle.DataAccess.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\bin\Release\Common.pdb
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1