Merge remote-tracking branch 'origin/dev' into dev

5 years ago · 23e8708a9c
parent ee2247d24b 20d8fb5599
commit 23e8708a9c
2 changed files with 2 additions and 2 deletions
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@ -9,7 +9,7 @@ use GuzzleHttp\Client;

 class GameSourceService {

-    const IS_FIXED_IOS13 = true;
+    const IS_FIXED_IOS13 = false;
    const DEBUG = true;

    public function __construct()
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@ -1225,7 +1225,7 @@ class DownloadController extends BaseController {
              //  $this->ajaxReturn(array("status" => -1, "msg" => "添加导出日志失败", 'ret' => $res));
             $this->error('添加下载失败');
            }
-       $this->success('添加下载成功',U('listsIndex'));
+       $this->success('添加下载成功,导出数据不包含当天',U('listsIndex'));
     }
     
     public function userRecharge_data_export() {