• libin's avatar
    Merge branch 'user-thrid-authorization' into dev · 988e18a8
    libin authored
    # Conflicts:
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
    #	xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java
    #	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
    #	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UserInfoController.java
    988e18a8
Name
Last commit
Last update
..
builder Loading commit data...
file Loading commit data...
mapper Loading commit data...
application.yml Loading commit data...
bootstrap.yml Loading commit data...
logback.xml Loading commit data...