• jiaorz's avatar
    Merge branch 'master-modify-cutAmount' into dev · 5ccf147f
    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
    5ccf147f
Name
Last commit
Last update
..
builder Loading commit data...
mapper Loading commit data...
application.yml Loading commit data...
bootstrap.yml Loading commit data...
logback.xml Loading commit data...