From dd3622adf0b2d2456f6547db195c14f7c04f58a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 9 Jan 2026 17:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/GiveGiftBases.php | 2 +- application/common/model/GiveGiftBase.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/api/model/GiveGiftBases.php b/application/api/model/GiveGiftBases.php index beb0dd94..36e58fc3 100644 --- a/application/api/model/GiveGiftBases.php +++ b/application/api/model/GiveGiftBases.php @@ -365,7 +365,7 @@ class GiveGiftBases extends Model if (!empty($params['end_time'])) { $options['end_time'] = strtotime($params['end_time']); } - + var_dump($options); // 分页参数 $options['page'] = $params['page'] ?? 1; diff --git a/application/common/model/GiveGiftBase.php b/application/common/model/GiveGiftBase.php index 6e396c06..1781faf3 100644 --- a/application/common/model/GiveGiftBase.php +++ b/application/common/model/GiveGiftBase.php @@ -476,7 +476,7 @@ class GiveGiftBase extends Model 'start_time' => null, 'end_time' => null, ]; - var_dump($options); + $options = array_merge($defaultOptions, $options); var_dump(111);