Merge branch 'fusion-1.5.0' into test

src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -79,6 +79,10 @@ public class FusionService implements IFusionService {
             resourceList = Collections.singletonList(3);
         }else if(param.getType()!=null && param.getType() == 4){
             resourceList = Collections.singletonList(4);
+        }else if(param.getType() !=null && param.getType() == 6){
+            resourceList = Collections.singletonList(5);
+        }
+        if(param.getType() !=null &&  (param.getType() == 4 || param.getType() == 6 )){
             List<ScenePlusExt> plusExtList = scenePlusExtService.getSsObj();
             List<Long> plusIds = plusExtList.stream().map(ScenePlusExt::getPlusId).collect(Collectors.toList());
             if(plusIds.size() >0){