# Conflicts:
# index/src/main/java/com/yoho/search/consumer/index/fullbuild/BrandIndexBuilder.java
# index/src/main/java/com/yoho/search/consumer/index/fullbuild/ShopsIndexBuilder.java
# index/src/main/java/com/yoho/search/consumer/index/increment/ShopsBrandsMqListener.java
# index/src/main/java/com/yoho/search/consumer/index/increment/ShopsMqListener.java
# index/src/main/resources/esmapping/shops.json
# service/src/main/java/com/yoho/search/consumer/service/logic/ProductIndexLogicService.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/ProductSizesBuilder.java
# service/src/main/java/com/yoho/search/consumer/service/logic/productIndex/viewBuilder/ViewBuilder.java
# web/src/main/resources/config.properties
