Skip to content

C
cloud-platform
Switch branch/tag
  1. 20 Sep, 2019 34 commits
  3. 19 Sep, 2019 6 commits
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · d0173791
      jiaorz authored
      d0173791
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 4ee5c2a8
      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
      4ee5c2a8
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 07c6ab4d
      jiaorz authored
      07c6ab4d
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · b6ee679e
      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
      b6ee679e
    • 周健威's avatar
      修改免费天数bug · 26422e89
      周健威 authored
      26422e89
    • 周健威's avatar
      修改bug · b12493b2
      周健威 authored
      b12493b2