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

未续费项目增加搜索



查看合并请求 !2737

@@ -323,9 +323,9 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
         }
         }
         $query = $query->where('gl_project.type',2)->where('gl_project.extend_type','!=',5);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
         $query = $query->where('gl_project.type',2)->where('gl_project.extend_type','!=',5);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
-        $query->where(function ($subQuery) {
-            $subQuery->where('gl_project.is_upgrade',1);
-        });
+//        $query->where(function ($subQuery) {
+//            $subQuery->where('gl_project.is_upgrade',1);
+//        });
         return $query;
         return $query;
     }
     }