# Conflicts: # gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java # gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java