Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Home/Controller/QueryController.class.php

@@ -1841,7 +1841,7 @@ class QueryController extends BaseController
             }
 
             $map['s.pay_time'] = ['between', [$begTime, $endTime - 1]];
-            $fieldS = "sum(s.pay_amount) recharge_cost, count(*) recharge_count, s.user_id, s.user_account, s.promote_account, s.game_name, s.sdk_version, s.server_name, s.game_player_name";
+            $fieldS = "sum(s.pay_amount) recharge_cost, count(*) recharge_count, s.user_id, s.user_account, s.promote_account, s.game_name, s.sdk_version, s.server_name, SUBSTRING_INDEX(GROUP_CONCAT(s.game_player_name order by s.id desc), ',', 1) as game_player_name";
             $fieldUser = 'u.register_time, u.login_time';
 
             $spendMap['_string'] = 'today.user_id = s.user_id and today.game_id = s.game_id and today.server_id = s.server_id and today.game_player_id = s.game_player_id and today.promote_id = s.promote_id';