Skip to content

C
cloud-platform
Switch branch/tag
  1. 21 Sep, 2019 25 commits
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/dev' into dev · fd753c38
      jiaorz authored
      fd753c38
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 084a4bc6
      jiaorz authored
      084a4bc6
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · c7c686ec
      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
      c7c686ec
    • libin's avatar
      小程序车辆申请 · 5a9af981
      libin authored
      5a9af981
    • libin's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 21d1793d
      libin authored
      21d1793d
    • libin's avatar
      小程序车辆申请 · dc1bd2f8
      libin authored
      dc1bd2f8
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · faf72def
      jiaorz authored 
      # Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
      faf72def
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · c294a45b
      jiaorz authored
      c294a45b
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 2d095128
      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
      2d095128
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · d5daa7fc
      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
      d5daa7fc
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 8b3cb93a
      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
      8b3cb93a
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · b6d443b8
      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
      b6d443b8
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 5f9a3a18
      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
      5f9a3a18
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 7dbad04a
      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
      7dbad04a
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 29e51147
      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
      29e51147
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 2c7df08c
      jiaorz authored
      2c7df08c
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 1198df2a
      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
      1198df2a
    • 周健威's avatar
      Merge remote-tracking branch 'origin/dev' into dev · a4ed04cc
      周健威 authored
      a4ed04cc
    • 周健威's avatar
      Merge branch 'master-modify-cutAmount' into dev · 47ed6ce9
      周健威 authored
      47ed6ce9
    • 周健威's avatar
      修复退款bug · 18048456
      周健威 authored
      18048456
    • libin's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 913107af
      libin authored
      913107af
    • libin's avatar
      小程序分公司接口查询 · 3cab8ab9
      libin authored
      3cab8ab9
    • libin's avatar
      小程序分公司接口查询 · 9bc7f0dc
      libin authored
      9bc7f0dc
    • 周健威's avatar
      Merge branch 'master-modify-cutAmount' into dev · 8020fd61
      周健威 authored
      8020fd61
    • 周健威's avatar
      修改代码 · 79217c9f
      周健威 authored
      79217c9f
  3. 20 Sep, 2019 15 commits