Merge branch 'fix/member_user_info' of wmtx/platform into release

优化游戏统计弹框时间错误问题

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}";
         }
 

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);