-
# Conflicts: # search-consumer-index/src/main/java/com/yoho/search/consumer/index/fullbuild/ProductIndexIndexBuilder.java # search-consumer-index/src/main/java/com/yoho/search/consumer/index/fullbuild/StorageSkuIndexBuilder.java # search-consumer-service/src/main/java/com/yoho/search/consumer/service/base/ProductIndexService.java
-
…onsumer into zf_dependency_opt
-
…onsumer into zf_dependency_opt
-
… into zf_dependency_opt
-
# Conflicts: # consumer/src/main/java/com/yoho/search/comsumer/mq/ProductMqListener.java # consumer/src/main/java/com/yoho/search/comsumer/mq/ProductPoolDetailMqListener.java # consumer/src/main/java/com/yoho/search/comsumer/mq/ProductPoolIndexService.java # consumer/src/main/java/com/yoho/search/comsumer/mq/StorageSkuIndexService.java