YOHOBUY / yohobuy-activity · Commits

Conflicts:
	pom.xml
	queue/src/main/java/com/yoho/activity/queue/service/impl/CutDownPriceServiceImpl.java

Conflicts:
	dal/src/main/java/com/yoho/activity/dal/CutDownPriceActivityMapper.java
	service/src/main/resources/META-INF/spring/spring-interceptor-config.xml

Conflicts:
	service/src/main/resources/META-INF/spring/spring-interceptor-config.xml

Conflicts:
	service/src/main/resources/META-INF/spring/spring-interceptor-config.xml
	web/src/main/resources/rabbitmq.yml
	web/src/main/webapp/META-INF/autoconf/rabbitmq.yml