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

变更数据



查看合并请求 !2990

@@ -320,7 +320,7 @@ class ProjectController extends BaseController
             }
         }
         if(isset($this->map['seo_plan'])){
-            $query = $query->whereNotIn('gl_project_deploy_build.seo_plan',[0,9])->where('gl_project.plan',0);
+            $query = $query->whereNotIn('gl_project_deploy_build.seo_plan',[0,9])->where('gl_project_deploy_build.plan',0);
         }
         if(isset($this->map['site_status'])){
             $query = $query->where('gl_project.site_status',$this->map['site_status']);