丁云鹏 il y a 1 an
Parent
commit
5fcf92374e

+ 0 - 5
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/AbstractFilterService.java

@@ -62,11 +62,6 @@ public abstract class AbstractFilterService {
                 param.getAppType(), param.getRegionCode(), param.getAppRegionFiltered(), param.getVideosWithRisk(),
                 param.getVideoIds(), param.getForceTruncation());
 
-<<<<<<<HEAD
-                =======
-        // TODO 供给实验
-
->>>>>>>8475e4d (supply exp)
         videoIds = filterBySupplyExp(param.getAppType(), param.getExpIdMap(), videoIds);
 
         if (param.isNotUsePreView()) {