yoho-search / yoho-search-consumer · Commits

# Conflicts:
#	index/src/main/resources/esmapping/productindex.json

# Conflicts:
#	index/src/main/resources/esmapping/productindex.json
#	service/src/main/java/com/yoho/search/consumer/service/base/ProductIndexService.java
#	service/src/main/java/com/yoho/search/consumer/service/bo/ProductIBO.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/productIndex/ProductILogicService.java

# 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