|
@@ -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()) {
|