Skip to content

C
cloud-platform
Switch branch/tag
  1. 24 Sep, 2019 3 commits
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 9e23c8ed
      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
      9e23c8ed
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 52a9ae8f
      jiaorz authored
      52a9ae8f
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · c68eebbc
      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
      c68eebbc
  3. 23 Sep, 2019 6 commits
  5. 21 Sep, 2019 31 commits