Merge branch 'feature/crmAdmin0717' into develop

app/crm/controller/CustomerController.php

@@ -390,12 +390,12 @@ class CustomerController extends BaseController
         //拜访数
         $whereVisit = $where;
         $whereVisit[] = ['type', '=', 0];
-        $visit = Follow::where($whereVisit)->distinct('customer_id')->count();
+        $visit = Follow::where($whereVisit)->count();
 
         //跟进数
         $whereVisit = $where;
         $whereVisit[] = ['type', '=', 1];
-        $follow = Follow::where($whereVisit)->distinct('customer_id')->count();
+        $follow = Follow::where($whereVisit)->count();
 
         $res = [
             'customer' => $customer, //客户数

app/process/Task.php

@@ -30,6 +30,8 @@ class Task
                     'receive type'=>'person'
                 ];
                 \Webman\RedisQueue\Redis::send("feishu-message",$res);
+                $item->warn = 1;
+                $item->save();
             }
 
             Log::info('send follow start',[time()]);