Merge branch 'dev_zyx' into dev

5 years ago · 943564f82d
parent d79da20c28 d5a90238ec
commit 943564f82d
1 changed files with 2 additions and 1 deletions
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@ -5469,7 +5469,8 @@ if ($key == 'model'){
    function gameFinanceDetail() {
-
+        set_time_limit(0);
        ini_set('memory_limit', '512M');
        $month = I("game_name");
        $xlsName = $month.'充值流水';