Merge pull request '修改用户邀请记录查询' (#179) from dev into master

Reviewed-on: #179

app/controller/api/user/User.php

@@ -567,8 +567,7 @@ class User extends BaseController
         $count =  $userQuery->count();
         $userIds = $userQuery->page($page, $limit)->column('uid');
         $query = Merchant::whereIn('uid', $userIds)->where('is_del', 0);
-        $merchants = $query->page($page, $limit)
-            ->field('mer_id,mer_name,uid,real_name,sale_amount,purchase_amount as buy_amount')
+        $merchants = $query->field('mer_id,mer_name,uid,real_name,sale_amount,purchase_amount as buy_amount')
             ->select()->toArray();
         $merchants = reset_index($merchants, 'uid');
         $result = [];