Skip to content

C
cloud-platform
Switch branch/tag
  1. 23 Sep, 2019 25 commits
    • 周健威's avatar
      Merge branch 'master-modify-cutAmount' into dev · 8c4f26e1
      周健威 authored
      8c4f26e1
    • 周健威's avatar
      修改代码 · 759ab4ae
      周健威 authored
      759ab4ae
    • jiaorz's avatar
      Merge branch 'master-bug-0921' into dev · 34825ad6
      jiaorz authored 
      # Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml
      34825ad6
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 8944baa5
      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
      8944baa5
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · e966b12c
      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
      e966b12c
    • jiaorz's avatar
      Merge branch 'master-bug-0921' into dev · 8bac8f93
      jiaorz authored
      8bac8f93
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 60ed4609
      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
      60ed4609
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 18379919
      jiaorz authored
      18379919
    • jiaorz's avatar
      Merge branch 'master-bug-0921' into dev · 3d0e2eac
      jiaorz authored
      3d0e2eac
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 19abf1f2
      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
      19abf1f2
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 2b29f5e7
      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
      2b29f5e7
    • 周健威's avatar
      Merge remote-tracking branch 'origin/dev' into dev · a075f821
      周健威 authored
      a075f821
    • 周健威's avatar
      修改代码 · 09cf806b
      周健威 authored
      09cf806b
    • hezhen's avatar
      Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 549d411d
      hezhen authored
      549d411d
    • hezhen's avatar
      Merge branch 'hz_master' into dev · 3c37a81d
      hezhen authored
      3c37a81d
    • hezhen's avatar
      123 · 51fef0f1
      hezhen authored
      51fef0f1
    • jiaorz's avatar
      Merge branch 'master-bug-0921' into dev · 765e1fa9
      jiaorz authored
      765e1fa9
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · a6b94004
      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
      a6b94004
    • jiaorz's avatar
      Merge branch 'master-bug-0921' into dev · 8d07da8e
      jiaorz authored
      8d07da8e
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · dfdc711f
      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
      dfdc711f
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 654dabc1
      jiaorz authored
      654dabc1
    • jiaorz's avatar
      Merge branch 'master-modify-cutAmount' into dev · 40eebd85
      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
      40eebd85
    • hezhen's avatar
      Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 5f11ce63
      hezhen authored
      5f11ce63
    • hezhen's avatar
      123 · 4f78f3b5
      hezhen authored
      4f78f3b5
    • jiaorz's avatar
      Merge branch 'master' into master-bug-0921 · e451116e
      jiaorz authored
      e451116e
  3. 21 Sep, 2019 15 commits