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.CoreCompileInputs.cache |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index c46e7dd..a0578fb 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
-1fc600291e56e237859fa8b3d953e7128f3b8b31
+<<<<<<< HEAD
+12e65c17b8944c912c6483c66ed2578caa57f1d2
+=======
+db450e1efa71a4dea326f082acc3fcb64ed72125
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1