Skip to content

C
cloud-platform
Switch branch/tag
  1. 18 Sep, 2019 5 commits
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · d0c0b34c
      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
      d0c0b34c
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · df999680
      jiaorz authored
      df999680
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 8a79ef09
      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
      8a79ef09
    • 周健威's avatar
      修复订单相关bug · 26cacf84
      周健威 authored
      26cacf84
    • 周健威's avatar
      修复订单相关bug · 7765cc1e
      周健威 authored
      7765cc1e
  3. 17 Sep, 2019 14 commits
  5. 16 Sep, 2019 21 commits