-
# 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
-
# Conflicts: # service/src/main/java/com/yoho/search/consumer/service/logic/ProductIndexLogicService.java
-
# 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/ProductIndexBO.java # service/src/main/java/com/yoho/search/consumer/service/logic/ProductIndexLogicService.java
