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

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

diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 61620f8..2fa7cbb 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
-4bbea2577b7ed86cc5fc0ed6bf934eb6f87042d3
+<<<<<<< HEAD
+0c60e0363c7ebe19e617b065424b04ecbc8fd3d6
+=======
+ffceac74583ffe022717b2538e55c4e28b8e84c0
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1