合并分支 'master-server' 到 'master'

修改统计项目脚本



查看合并请求 !927

@@ -75,7 +75,7 @@ class WeekProject extends Command
         $countModel = new Count();
         $countModel = new Count();
         $yesCountInfo = $countModel->read(['project_id'=>$yesterday],['inquiry_num','country']);
         $yesCountInfo = $countModel->read(['project_id'=>$yesterday],['inquiry_num','country']);
         $data['inquiry_total'] = $yesCountInfo['inquiry_num'] ?? 0;//询盘数量
         $data['inquiry_total'] = $yesCountInfo['inquiry_num'] ?? 0;//询盘数量
-        $data['inquiry_country'] = json_decode($yesCountInfo['country'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+        $data['inquiry_country'] = $yesCountInfo['country'];
         $lastDayOfLastWeek = Carbon::now()->subWeek()->endOfWeek(Carbon::SUNDAY)->toDateString(); // 获取上周的最后一天
         $lastDayOfLastWeek = Carbon::now()->subWeek()->endOfWeek(Carbon::SUNDAY)->toDateString(); // 获取上周的最后一天
         //本周
         //本周
         $lastDayOfLastWeekInfo = $countModel->read(['project_id'=>$lastDayOfLastWeek],['inquiry_num']);
         $lastDayOfLastWeekInfo = $countModel->read(['project_id'=>$lastDayOfLastWeek],['inquiry_num']);