-
# 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/TblLogicService.java