From 148b7e632c249c2a9d1dd077de3d181737bb37b6 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期三, 11 五月 2022 11:55:03 +0800
Subject: [PATCH] 订单列表增加充值金额；客户列表增加账户余额；累计充值金额除以1000

---
 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 1d29b54..2fa7cbb 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
-0f5612b96640f5138a9eebbd1fdaf6592870e349
+<<<<<<< HEAD
+0c60e0363c7ebe19e617b065424b04ecbc8fd3d6
+=======
+ffceac74583ffe022717b2538e55c4e28b8e84c0
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1