# Conflicts: # share-quartz/src/main/java/share/quartz/task/RedisTask.java # share-system/src/main/java/share/system/domain/vo/SConsumerVo.java # share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java # share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
