-
Conflicts: service/src/main/java/com/yoho/search/recall/scene/beans/cache/BatchRecallCacheBean.java service/src/main/java/com/yoho/search/recall/scene/beans/cache/SknBaseInfoCacheBean.java service/src/main/java/com/yoho/search/recall/scene/beans/persional/AbstractPageComponent.java service/src/main/java/com/yoho/search/recall/scene/beans/persional/PageProductIdBitSetComponent.java service/src/main/java/com/yoho/search/recall/scene/models/personal/PageProductIdBitSet.java service/src/main/java/com/yoho/search/recall/scene/models/req/SknBaseInfoRequest.java service/src/main/java/com/yoho/search/recall/scene/models/req/SknBaseInfoResponse.java
-
Conflicts: service/src/main/java/com/yoho/search/recall/scene/beans/persional/AbstractPageComponent.java service/src/main/java/com/yoho/search/recall/scene/beans/persional/PageProductIdBitSetComponent.java service/src/main/java/com/yoho/search/recall/scene/beans/strategy/impls/RecommendSknStrategy.java service/src/main/java/com/yoho/search/recall/scene/models/req/SknBaseInfoRequest.java service/src/main/java/com/yoho/search/recall/scene/models/req/SknReturnInfoResquest.java
-
Conflicts: service/src/main/java/com/yoho/search/recall/scene/beans/cache/UserRecallCacheBean.java service/src/main/java/com/yoho/search/recall/scene/beans/persional/AbstractPageComponent.java service/src/main/java/com/yoho/search/recall/scene/beans/persional/PageProductIdBitSetComponent.java service/src/main/java/com/yoho/search/recall/scene/beans/strategy/impls/RecommendSknStrategy.java service/src/main/java/com/yoho/search/recall/scene/models/personal/PageProductIdBitSet.java
