xx-activity/xx-activity-server/src/main · 39460a7999691f8be482ef966c04fede08853fbd · youjj / cloud-platform

Merge remote-tracking branch 'origin/base-modify' into base-modify · 5741e09e

jiaorz authored Jul 19, 2019

# Conflicts:
#	ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java
#	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java

5741e09e

Name	Last commit	Last update
..
java/com/xxfc/platform/activity		Loading commit data...
resources		Loading commit data...