Files · 9e2c7e1f516d0d25df32addf7588f84a028eeb55 · youjj / cloud-platform · GitLab

History Find file

Merge branch 'master_activity-hf' into base-modify · 9e2c7e1f

hanfeng authored Oct 10, 2019

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

9e2c7e1f

Name	Last commit	Last update
ace-auth		Loading commit data...
ace-common		Loading commit data...
ace-control		Loading commit data...
ace-gate		Loading commit data...
ace-modules		Loading commit data...
ace-sidecar		Loading commit data...
alibaba-base		Loading commit data...
xx-activity		Loading commit data...
xx-app		Loading commit data...
xx-campsite		Loading commit data...
xx-common		Loading commit data...
xx-im		Loading commit data...
xx-order		Loading commit data...
xx-summit		Loading commit data...
xx-tour		Loading commit data...
xx-uccn		Loading commit data...
xx-universal		Loading commit data...
xx-user-behavior-collect		Loading commit data...
xx-vehicle		Loading commit data...
.gitignore		Loading commit data...
LICENSE		Loading commit data...
README.md		Loading commit data...
docker-compose.yml		Loading commit data...
pom.xml		Loading commit data...