소스 검색

feat:修改校准方式

zhaohaipeng 3 달 전
부모
커밋
1991573d0b
1개의 변경된 파일0개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 5
      recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallService.java

+ 0 - 5
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallService.java

@@ -109,13 +109,8 @@ public class RecallService implements ApplicationContextAware {
 
         Set<String> abExpCodes = param.getAbExpCodes();
         if (CollectionUtils.isNotEmpty(abExpCodes)) {
-<<<<<<< Updated upstream
-            if (abExpCodes.contains("563")
-                    || abExpCodes.contains("567")) {
-=======
             if (abExpCodes.contains("563") || abExpCodes.contains("562")
                     || abExpCodes.contains("564")) {
->>>>>>> Stashed changes
                 strategies.add(strategyMap.get(SceneCFRovnRecallStrategy.class.getSimpleName()));
                 strategies.add(strategyMap.get(SceneCFRosnRecallStrategy.class.getSimpleName()));
             }