From a5b73d82f5bff833fc8fb2d86ce027ba12007b65 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 17 Mar 2020 16:52:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Common/Conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Common/Conf/config.php b/Application/Common/Conf/config.php index b260afc60..8d45ce0a4 100644 --- a/Application/Common/Conf/config.php +++ b/Application/Common/Conf/config.php @@ -86,7 +86,7 @@ $config = array( 'DOCUMENT_MODEL_TYPE' => array(2 => '主题', 1 => '目录', 3 => '段落'), //错误页面 'ERROR_MESSAGE' => '页面错误！请稍后再试～',//错误显示信息,非调试模式有效 - 'ERROR_PAGE' => 'public/error/404.html', // 错误定向页面 + 'ERROR_PAGE' => 'public/error/404.html', // 错误定向页面。 ); $config = array_merge($config, $env); From 82aa4f762bd2508bd9887e6e341f1ff4d945dfbe Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 18 Mar 2020 10:58:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=BC=B9=E6=A1=86=E6=97=B6=E9=97=B4=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index d66eded35..e5dd192a8 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -895,7 +895,7 @@ class FinanceController extends ThinkController } if (!empty(I('timeend'))) { - $timeend = strtotime(I('timeend')); + $timeend = strtotime(I('timeend') . ' 23:59:59');; $map['_string'] .= " and pay_time < {$timeend}"; }