• hanfeng's avatar
    Merge remote-tracking branch 'origin/dev' into dev · bf5dcdd5
    hanfeng authored
    # Conflicts:
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
    #	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
    bf5dcdd5
Name
Last commit
Last update
..
ace-admin Loading commit data...
ace-admin-api Loading commit data...
ace-generator Loading commit data...
ace-interface Loading commit data...
ace-tool Loading commit data...
pom.xml Loading commit data...