Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -310,7 +310,7 @@ class WebTraffic extends Command
                $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
                $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
                $query->where('pdo.start_date', '<', $startTime);
                $query->where('pdo.start_date', '<', $startTime);
            }
            }
-        })->select(['pdo.project_id','gl_project.main_lang_id'])->forPage($page, 500)->get();
+        })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get();
         //其他地方在引流的域名
         //其他地方在引流的域名
         $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
         $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
         $data = [];
         $data = [];

@@ -346,7 +346,7 @@ class WebTrafficRussia extends Command
                $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
                $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
                $query->where('pdo.start_date', '<', $startTime);
                $query->where('pdo.start_date', '<', $startTime);
            }
            }
-        })->select(['pdo.project_id','gl_project.main_lang_id'])->forPage($page, 500)->get();
+        })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get();
         //其他地方在引流的域名
         //其他地方在引流的域名
         $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
         $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
         $data = [];
         $data = [];