合并分支 'akun' 到 'master'

Akun



查看合并请求 !1410

@@ -258,7 +258,7 @@ class InquiryForwardLogic extends BaseLogic
         if (count($re_route) > 0) {
         if (count($re_route) > 0) {
             //根据项目id查询项目，并根据询盘量排序
             //根据项目id查询项目，并根据询盘量排序
             $project_ids = array_column($re_route, 'project_id');
             $project_ids = array_column($re_route, 'project_id');
-            $re_project = InquiryProject::select(['id', 'project', 'channel', 'domain'])->whereIn('id', $project_ids)->orderBy('recent_inquiry', 'asc')->get();
+            $re_project = InquiryProject::select(['id', 'project', 'channel', 'domain', 'recent_inquiry', 'remark', 'version'])->whereIn('id', $project_ids)->orderBy('recent_inquiry', 'asc')->get();
 
 
             if ($re_project->count() > 0) {
             if ($re_project->count() > 0) {
                 //根据代理商去重
                 //根据代理商去重
@@ -289,7 +289,10 @@ class InquiryForwardLogic extends BaseLogic
                         $lists[] = [
                         $lists[] = [
                             'id' => $vp->id,
                             'id' => $vp->id,
                             'project' => $vp->project,
                             'project' => $vp->project,
-                            'route' => $vp->domain . $route
+                            'route' => $vp->domain . $route,
+                            'recent_inquiry' => $vp->recent_inquiry,
+                            'remark' => $vp->remark ?: '',
+                            'version' => $vp->version
                         ];
                         ];
                     }
                     }
                 }
                 }