-
# Conflicts: # service/src/main/java/com/yoho/search/consumer/service/bo/ProductIndexBO.java
-
# Conflicts: # index/src/main/java/com/yoho/search/consumer/index/fullbuild/tbl/TblBrandIndexBuilder.java # service/src/main/java/com/yoho/search/consumer/service/logicService/tbl/TblBrandLogicService.java