- 26 Jun, 2019 19 commits
 - 
- 
hezhen authored
 - 
hezhen authored
 - 
hezhen authored
 - 
jiaorz authored
 - 
jiaorz authored
 - 
 - 
hezhen authored
 - 
libin authored
 - 
libin authored
 - 
 - 
libin authored
 - 
hezhen authored
 - 
 - 
hezhen authored
 - 
http://113.105.137.151:22280/youjj/cloud-platformlibin authored
# Conflicts: # xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/AppApplication.java
 - 
libin authored
 - 
libin authored
 - 
hezhen authored
 - 
libin authored
 
 - 
 - 25 Jun, 2019 21 commits
 - 
- 
libin authored
 - 
周健威 authored
 - 
周健威 authored
 - 
 - 
hezhen authored
 - 
jiaorz authored
 - 
 - 
hezhen authored
 - 
周健威 authored
 - 
周健威 authored
 - 
 - 
hezhen authored
 - 
周健威 authored
 - 
周健威 authored
 - 
周健威 authored
 - 
周健威 authored
 - 
周健威 authored
 - 
hezhen authored
 - 
周健威 authored
# Conflicts: # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleUpkeepController.java
 - 
周健威 authored
 - 
hezhen authored
 
 -