Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/dao/SkillInfoDao.java

@@ -6,5 +6,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
 import java.util.List;
 
 
 public interface SkillInfoDao extends JpaRepository<SkillInfoEntity, Long> {
 public interface SkillInfoDao extends JpaRepository<SkillInfoEntity, Long> {
-    List<SkillInfoEntity> getAll();
+    List<SkillInfoEntity> findAll();
 }
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/PublicServiceImpl.java

@@ -51,7 +51,7 @@ public class PublicServiceImpl implements PublicService {
 
 
     @Override
     @Override
     public Result<?> getSkillTree() {
     public Result<?> getSkillTree() {
-        List<PublicSkillTreeDTO.Content> contents = skillInfoDao.getAll().stream().map(entity -> {
+        List<PublicSkillTreeDTO.Content> contents = skillInfoDao.findAll().stream().map(entity -> {
             return new PublicSkillTreeDTO.Content()
             return new PublicSkillTreeDTO.Content()
                     .setBrand(entity.getBrand())
                     .setBrand(entity.getBrand())
                     .setType(entity.getType())
                     .setType(entity.getType())