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

---
 web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index ae28740..732ea46 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d5ec7438d89fe18e3bec35b6f500682586a1659d
-=======
-43d05d7d9c29e436978c39f631255cf56ad1e8a9
->>>>>>> remotes/origin/Release
+0544a4b948cdc93476250066129b440538ad7759

--
Gitblit v1.9.1