• jiaorz's avatar
    Merge branch 'master-modify-cutAmount' into dev · 8d91a099
    jiaorz authored
    # Conflicts:
    #	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
    8d91a099
Name
Last commit
Last update
..
xx-order-api Loading commit data...
xx-order-server Loading commit data...
pom.xml Loading commit data...