Skip to content

C
cloud-platform
Switch branch/tag
  1. 24 Sep, 2019 6 commits
  3. 23 Sep, 2019 31 commits
  5. 21 Sep, 2019 3 commits
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 341353bd
      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
      341353bd
    • hezhen's avatar
      添加峰会 · 226f51c0
      hezhen authored
      226f51c0
    • 周健威's avatar
      Merge branch 'dev' · d2cbffe2
      周健威 authored 
      # Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
      d2cbffe2