• jiaorz's avatar
    Merge branch 'master-bg-update' · d335f395
    jiaorz authored
    # Conflicts:
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
    #	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
    d335f395
Name
Last commit
Last update
..
xx-order-api Loading commit data...
xx-order-server Loading commit data...
pom.xml Loading commit data...