yoho-search / yoho-search-consumer · Commits

# Conflicts:
#	service/src/main/java/com/yoho/search/consumer/service/logic/ProductIndexLogicService.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/productIndex/ProductGoodsLogicService.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/productIndex/viewBuilder/ProductGoodsBuilder.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/tools/SpecialDealLogicService.java

# Conflicts:
#	index/src/main/java/com/yoho/search/consumer/index/increment/bulks/ProductPoolIndexBulkService.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/ProductPoolLogicService.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/ShopsLogicService.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/productIndex/viewBuilder/ProductFeaturesBuilder.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/tools/MapGenerator.java