• jiaorz's avatar
    Merge remote-tracking branch 'origin/master' · 82b45c62
    jiaorz authored
    # Conflicts:
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
    #	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
    82b45c62
Name
Last commit
Last update
..
xx-order-api Loading commit data...
xx-order-server Loading commit data...
pom.xml Loading commit data...