yoho-search / yoho-search-service · Commits

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

Conflicts:
	service/src/main/java/com/yoho/search/service/base/index/ProductIndexBaseService.java