Merge branch 'develop-dingwf-0714' into develop

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

@@ -52,7 +52,7 @@ public class BusinessBaseServiceImpl implements BusinessBaseService {
         List<BusinessSkillListDTO.Content> contents = page.getContent().stream().map(e -> {
             BusinessSkillListDTO.Content content = new BusinessSkillListDTO.Content();
             BeanUtils.copyProperties(e, content);
-            content.setSkillGroupName(mapSkillGroup.get(e.getSkillCode()));
+            content.setSkillGroupName(mapSkillGroup.get(e.getSkillGroupCode()));
             content.setLayerName(mapLayer.get(e.getLayerId()));
             return content;
         }).collect(Collectors.toList());