From f68bc5b68473185855f68e2d9e99b14d74e130e2 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 15 Mar 2024 11:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/user/User.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php
index 58f1b7ab..018095e7 100755
--- a/app/controller/api/user/User.php
+++ b/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 = [];