From 84a3ef10e4219ad844e6ea86af65d8dec84f28d4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 04 Aug 2021 16:51:28 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/resources/mapper/user/UserMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-user/src/main/resources/mapper/user/UserMapper.xml b/gc-user/src/main/resources/mapper/user/UserMapper.xml
index fc7665b..06dc6e0 100644
--- a/gc-user/src/main/resources/mapper/user/UserMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/UserMapper.xml
@@ -250,7 +250,7 @@
</update>
<select id="queryCuserDetail" resultType="java.util.HashMap">
- SELECT a.*, b.money, b.withdraw_money, c.pay_type, SUM(c.money) as moneyx FROM xzx_user_info a
+ SELECT a.*, b.money,b.collect_score collectScore, b.withdraw_money, c.pay_type, SUM(c.money) as moneyx FROM xzx_user_info a
LEFT JOIN xzx_account_info b ON a.user_id=b.user_id
LEFT JOIN xzx_pay_info c ON b.account_id=c.account_id
LEFT JOIN xzx_sys_config_info d ON c.pay_type=d.config_value AND d.config_type_code='PAY_TYPE'
--
Gitblit v1.9.1