# Conflicts: # share-system/src/main/java/share/system/service/ISStoreService.java # share-system/src/main/java/share/system/service/SConsumerService.java # share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java # share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java # share-system/src/main/resources/mapper/system/SConsumerMapper.xml
