yoho-search / yoho-search-consumer · Commits

# Conflicts:
#	index/src/main/java/com/yoho/search/consumer/index/increment/ActivityProductMqListener.java
#	index/src/main/java/com/yoho/search/consumer/index/increment/ProductPriceMqListener.java

# Conflicts:
#	index/src/main/java/com/yoho/search/consumer/index/increment/ActivityProductMqListener.java
#	index/src/main/java/com/yoho/search/consumer/index/increment/ProductPriceMqListener.java

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