Files · 7d3780988065b1acb1b3c4548bbe6473ba631dc0 · youjj / cloud-platform

Merge branch 'master-modify-background-bug-hf' into dev · 7d378098

hanfeng authored Nov 11, 2019

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

7d378098

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...