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

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

diff --git a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
index 701dd21..843fe01 100644
--- a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
@@ -1,39 +1,3 @@
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Model\obj\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\log4net.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Oracle.DataAccess.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Model.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\log4net.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Oracle.DataAccess.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\bin\Release\Common.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Release\Model.pdb
 D:\Company\SMGW_NewWeb\web\Model\bin\Release\Model.dll
 D:\Company\SMGW_NewWeb\web\Model\bin\Release\Model.pdb
 D:\Company\SMGW_NewWeb\web\Model\bin\Release\Common.dll
@@ -47,6 +11,7 @@
 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
@@ -76,3 +41,5 @@
 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