Skip to content

C
cloud-platform
Switch branch/tag
  1. 25 Sep, 2019 4 commits
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · f49d992c
      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
      f49d992c
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 1558905a
      jiaorz authored
      1558905a
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · ec647204
      jiaorz authored
      ec647204
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 56a2b824
      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
      56a2b824
  3. 24 Sep, 2019 36 commits