init

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankService.java

@@ -73,16 +73,6 @@ public class RankService {
             }
         }
 
-<<<<<<< HEAD
-
-        List<RankItem> sortedItems = new ArrayList<>();
-        for (String pool : contentPools) {
-            if (itemMap.containsKey(pool)) {
-                sortedItems.addAll(itemMap.get(pool));
-            }
-        }
-=======
->>>>>>> 031bdba (init)
         List<Content> contents = CommonCollectionUtils.toList(sortedItems, RankItem::getContent);
         log.info("Sort result {}", JSONUtils.toJson(contents));