From 4da7ec4711e77448ad229712e82a27f5f2ccd826 Mon Sep 17 00:00:00 2001
From: root <root@YAOOO>
Date: Tue, 5 Dec 2023 13:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/middle/Merchant.php  | 5 ++++-
 app/controller/middle/User.php      | 5 ++++-
 app/controller/middle/UserGroup.php | 5 ++++-
 app/controller/middle/UserLabel.php | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/controller/middle/Merchant.php b/app/controller/middle/Merchant.php
index f03e3fa4..5a0f9e22 100644
--- a/app/controller/middle/Merchant.php
+++ b/app/controller/middle/Merchant.php
@@ -59,7 +59,10 @@ class Merchant extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id', 'area_id', 'street_id']);
-        return app('json')->success($this->repository->lst($where, $page, $limit));
+        $data = $this->repository->lst($where, $page, $limit);
+        $data['lists'] = $data['list'];
+        unset($data['list']);
+        return app('json')->success($data);
     }
 
 }
diff --git a/app/controller/middle/User.php b/app/controller/middle/User.php
index 5b0eee33..83405e02 100644
--- a/app/controller/middle/User.php
+++ b/app/controller/middle/User.php
@@ -41,7 +41,10 @@ class User extends BaseController
             'uid',
             ]);
         [$page, $limit] = $this->getPage();
-        return app('json')->success($this->repository->getList($where, $page, $limit));
+        $data = $this->repository->getList($where, $page, $limit);
+        $data['lists'] = $data['list'];
+        unset($data['list']); 
+        return app('json')->success($data);
     }
 
 }
diff --git a/app/controller/middle/UserGroup.php b/app/controller/middle/UserGroup.php
index b433b740..bc095df4 100644
--- a/app/controller/middle/UserGroup.php
+++ b/app/controller/middle/UserGroup.php
@@ -26,7 +26,10 @@ class UserGroup extends BaseController
     {
         $page = 1;
         $limit = 9999;
-        return app('json')->success($this->repository->getList([], $page, $limit));
+        $data = $this->repository->getList([], $page, $limit);
+        $data['lists'] = $data['list'];
+        unset($data['list']); 
+        return app('json')->success($data);
     }
 
 }
diff --git a/app/controller/middle/UserLabel.php b/app/controller/middle/UserLabel.php
index 06bfe7f1..a601a2bb 100644
--- a/app/controller/middle/UserLabel.php
+++ b/app/controller/middle/UserLabel.php
@@ -28,7 +28,10 @@ class UserLabel extends BaseController
         $limit = 9999;
         $where = $this->request->params(['type', 'all']);
         $where['mer_id'] = $this->request->merId();
-        return app('json')->success($this->repository->getList($where, $page, $limit));
+        $data = $this->repository->getList($where, $page, $limit);
+        $data['lists'] = $data['list'];
+        unset($data['list']); 
+        return app('json')->success($data);
     }
 
 }