Files · 53b5616e6b45f391b13778052c9317e0963af186 · youjj / cloud-platform · GitLab

History Find file

Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 53b5616e
hanfeng authored Aug 06, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java
```
53b5616e

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-tour		Loading commit data...
xx-universal		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...