From 51101bc0870cd34159c2b4c3de2e34fb5418c7c5 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Mon, 17 Jul 2023 15:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/DeviceWarningController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DeviceWarningController.php b/app/Http/Controllers/DeviceWarningController.php index 9c8e324..705996e 100644 --- a/app/Http/Controllers/DeviceWarningController.php +++ b/app/Http/Controllers/DeviceWarningController.php @@ -63,8 +63,8 @@ class DeviceWarningController extends Controller public function warningLog(Request $request) { $query = DeviceWarning::with(['base', 'device'])->filter($request->input())->orderBy('created_at', 'desc'); - $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); - + $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50)); + return $this->json(DeviceWarningResource::collection($list)); }