ace-modules/ace-admin/src/main · 127049c8fdc5a3900645b5d959167cf4fec90953 · youjj / cloud-platform

Merge remote-tracking branch 'origin/base-modify' into base-modify · 91bf3bac

libin authored Sep 16, 2019

# Conflicts:
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

91bf3bac

Name	Last commit	Last update
..
docker		Loading commit data...
java/com/github/wxiaoqi/security/admin		Loading commit data...
resources		Loading commit data...