ace-modules/ace-admin/src · add0c68cd6850c4df7cd9460a5dccb8f7f2d2210 · youjj / cloud-platform

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 44b42b01

hezhen authored Jun 18, 2019

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

44b42b01

Name	Last commit	Last update
..
main		Loading commit data...