fix: conflict

core/src/main/java/com/mooctest/crowd/domain/dao/CrowdTestProjectDao.java

@@ -26,7 +26,6 @@ public interface CrowdTestProjectDao extends CrudRepository<CrowdTestProjectPO,
 //    Optional<CrowdTestProjectPO> findById(Long id);
     List<CrowdTestProjectPO> findAll();
 
-     
     Page<CrowdTestProjectPO> findAll(Specification<CrowdTestProjectPO> spec,Pageable pageable);
 
     CrowdTestProjectPO findByIdAndIsDeleted(Long id, int isDeleted);

core/src/main/java/com/mooctest/crowd/domain/repository/CrowdTestProjectRepo.java

@@ -12,10 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
-<<<<<<< HEAD
 import org.springframework.data.jpa.domain.Specifications;
-=======
->>>>>>> 5b93d031b62b551fb286bd9660fcb82d610d9fe2
 import org.springframework.stereotype.Component;
 
 import javax.persistence.criteria.CriteriaBuilder;

core/src/main/java/com/mooctest/crowd/domain/repository/ICrowdTestProjectRepo.java

@@ -5,10 +5,7 @@ import com.mooctest.crowd.domain.exception.CrowdTestProjectNotExistException;
 import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-<<<<<<< HEAD
-=======
 import org.springframework.data.jpa.domain.Specification;
->>>>>>> 5b93d031b62b551fb286bd9660fcb82d610d9fe2
 
 import java.util.List;
 
@@ -17,15 +14,11 @@ import java.util.List;
  * @date 2019/7/6 19:10
  */
 public interface ICrowdTestProjectRepo {
-<<<<<<< HEAD
-    List<CrowdTestProjectPO> findAll();
 
     Page<CrowdTestProject> findAllByPage(Pageable pageable, String keyword, int deletedStatus);
-=======
     Page<CrowdTestProjectPO> findAll(Specification specification,Pageable pageable);
 
     List<CrowdTestProjectPO> findAll();
->>>>>>> 5b93d031b62b551fb286bd9660fcb82d610d9fe2
 
     CrowdTestProject getByID(Long id) throws CrowdTestProjectNotExistException;
 

site/src/main/java/com/mooctest/crowd/site/data/dto/CrowdTestSquareIndexDTO.java

@@ -35,17 +35,12 @@ public class CrowdTestSquareIndexDTO {
      * 初始化热门任务 ，热门项目
      */
     public void initHotTaskAndProject(){
-        List<CrowdTestProjectPO>  projectPOS=this.cowdTestProjects.stream().sorted(Comparator.comparing(CrowdTestProjectPO::getCreateTime)).collect(Collectors.toList());
-        this.cowdTestProjects=projectPOS;
+        List<CrowdTestProjectPO>  projectPOS=this.crowdTestProjects.stream().sorted(Comparator.comparing(CrowdTestProjectPO::getCreateTime)).collect(Collectors.toList());
+        this.crowdTestProjects=projectPOS;
         //根据参与人数和创建时间进行排序
-<<<<<<< HEAD
         List<CrowdTestProjectPO> list1 = this.crowdTestProjects.stream().sorted(Comparator.comparing(CrowdTestProjectPO::getCreateTime).reversed().thenComparing(Comparator.comparing(CrowdTestProjectPO::getJoinCount).reversed())).collect(Collectors.toList());
-        this.hotCrowdTestProject = list1;
-=======
-        List<CrowdTestProjectPO> list1 = this.cowdTestProjects.stream().sorted(Comparator.comparing(CrowdTestProjectPO::getCreateTime).reversed().thenComparing(Comparator.comparing(CrowdTestProjectPO::getJoinCount).reversed())).collect(Collectors.toList());
         //截取前七条
         this.hotCrowdTestProject = list1.subList(0,7);
->>>>>>> 5b93d031b62b551fb286bd9660fcb82d610d9fe2
         List<CrowdTestTaskPO> tasklist1 = crowdTestTaskPOS.stream().sorted(Comparator.comparing(CrowdTestTaskPO::getAcceptedCount).reversed()).collect(Collectors.toList());
         List<CrowdTestTaskPO> tasklist2 = tasklist1.stream().sorted(Comparator.comparing(CrowdTestTaskPO::getCreateTime).reversed()).collect(Collectors.toList());
         //过滤掉已完成的