# Conflicts:
#	xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java

# Conflicts:
#	xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

# Conflicts:
#	xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java
#	xx-universal/xx-universal-server/pom.xml

# Conflicts:
#	xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity