解决冲突

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProjectInfoServiceImpl.java

@@ -48,10 +48,11 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, P
     private WbsTreePrivateMapper wbsTreePrivateMapper;
 
     @Override
-    public List<ProjectInfo> selectProjectList() {
-        return this.baseMapper.selectProjectList();
+    public List<ProjectInfo> selectProjectList(List<String> projectIds) {
+        return this.baseMapper.selectProjectList(projectIds);
     }
 
+
     @Override
     public IPage<ProjectInfoVO> selectProjectInfoPage(IPage<ProjectInfoVO> page, ProjectInfoVO projectInfo) {
         return page.setRecords(baseMapper.selectProjectInfoPage(page, projectInfo));