From 362ea75c7aa9008c7b977fb6e5b8d97699432f9b Mon Sep 17 00:00:00 2001
From: yumo <yumo@im30.lan>
Date: Tue, 14 Nov 2023 10:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=848.2=E7=9A=84=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Advert.php | 1 +
 app/common/model/ModelTrait.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/Advert.php b/app/admin/controller/Advert.php
index 4e3aa75..d76f23e 100644
--- a/app/admin/controller/Advert.php
+++ b/app/admin/controller/Advert.php
@@ -53,6 +53,7 @@ class Advert extends AuthController
      * @param Request $request
      * @return string
      * @throws FormBuilderException
+     * @throws Exception
      */
     public function add(Request $request)
     {
diff --git a/app/common/model/ModelTrait.php b/app/common/model/ModelTrait.php
index 92fa52f..26381de 100644
--- a/app/common/model/ModelTrait.php
+++ b/app/common/model/ModelTrait.php
@@ -121,9 +121,9 @@ trait ModelTrait
      * @param null $eachFn 处理结果函数
      * @param array $params 分页参数
      * @param int $limit 分页数
-     * @return array
+     * @return BaseQuery
      */
-    public static function page($model = null, $eachFn = null, $params = [], $limit = 20): array
+    public static function page($model = null, $eachFn = null, $params = [], $limit = 20): BaseQuery|array|null
     {
         if (is_numeric($eachFn) && is_numeric($model)) {
             return parent::page($model, $eachFn);