Commits · cf7d929e632e16d99592162d4483c60b5d5fd794 · youjj / cloud-platform

11 Nov, 2019 40 commits
- Merge remote-tracking branch 'origin/dev' into dev · cf7d929e
  周健威 authored Nov 11, 2019
  
  cf7d929e
- Merge branch 'holiday-price' into dev · c7b896c9
  周健威 authored Nov 11, 2019
  
  c7b896c9
- 修改取消订单提示bug · 94cc813b
  周健威 authored Nov 11, 2019
  
  94cc813b
- Merge remote-tracking branch 'origin/holiday-price' into holiday-price · 40789321
  周健威 authored Nov 11, 2019
  
  40789321
- 修改取消订单提示bug · e25805d1
  周健威 authored Nov 11, 2019
  
  e25805d1
- Merge branch 'holiday-price' into dev · 8cbddf82
  jiaorz authored Nov 11, 2019
  
  8cbddf82
- 延期还车费用 · 117b61b5
  jiaorz authored Nov 11, 2019
  
  117b61b5
- Merge branch 'master-order-departure' into dev · 606f1ec5
  jiaorz authored Nov 11, 2019
  
  606f1ec5
- 核销添加验车人信息 · a6e84c4f
  jiaorz authored Nov 11, 2019
  
  a6e84c4f
- Merge remote-tracking branch 'origin/dev' into dev · 84678386
  周健威 authored Nov 11, 2019
  
  84678386
- Merge branch 'holiday-price' into dev · a2e6205c
  周健威 authored Nov 11, 2019
  
  a2e6205c
- 修改取消订单提示bug · 7234c1fe
  周健威 authored Nov 11, 2019
  
  7234c1fe
- Merge branch 'master-order-departure' into dev · aa9e7cde
  jiaorz authored Nov 11, 2019
  
  aa9e7cde
- 核销添加验车人信息 · 09e4dc1f
  jiaorz authored Nov 11, 2019
  
  09e4dc1f
- Merge branch 'master-order-departure' into dev · ca3e4164
  jiaorz authored Nov 11, 2019
  
  ca3e4164
- Merge branch 'holiday-price' into dev · 6d524eb5
  周健威 authored Nov 11, 2019
  
  6d524eb5
- 修改第一笔退款bug · 0eb7fde0
  周健威 authored Nov 11, 2019
  
  0eb7fde0
- 核销添加验车人信息 · 04486a6d
  jiaorz authored Nov 11, 2019
  
  04486a6d
- Merge remote-tracking branch 'origin/dev' into dev · 863c2cb3
  周健威 authored Nov 11, 2019
  
  863c2cb3
- Merge branch 'master-order-departure' into dev · 7feca3fb
  jiaorz authored Nov 11, 2019
  
  7feca3fb
- 后台 · d75da569
  jiaorz authored Nov 11, 2019
  
  d75da569
- Merge branch 'master-zjw' into dev · 9f2e2766
  周健威 authored Nov 11, 2019
  
  9f2e2766
- 修改代码 · 2d7110a4
  周健威 authored Nov 11, 2019
  
  2d7110a4
- Merge remote-tracking branch 'origin/dev' into dev · ab6e6898
  hanfeng authored Nov 11, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java
```
  ab6e6898
- Merge branch 'master-modify-background-bug-hf' into dev · b6e7a9ad
  hanfeng authored Nov 11, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
```
  b6e7a9ad
- Merge branch 'master-order-departure' into dev · dc55869c
  jiaorz authored Nov 11, 2019
  
  dc55869c
- 后台 · fa8cfe0e
  jiaorz authored Nov 11, 2019
  
  fa8cfe0e
- Merge branch 'master-order-departure' into dev · de39f92a
  jiaorz authored Nov 11, 2019
  
  de39f92a
- 后台 · 069f7bf6
  jiaorz authored Nov 11, 2019
  
  069f7bf6
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · c5d1b4f6
  hezhen authored Nov 11, 2019
  
  c5d1b4f6
- Merge branch 'master_position' into dev · c8e5a97a
  hezhen authored Nov 11, 2019
  
  c8e5a97a
- 添加字段 · dc95ef2c
  hezhen authored Nov 11, 2019
  
  dc95ef2c
- Merge branch 'master-bacground-im' into dev · a0b5ab7c
  jiaorz authored Nov 11, 2019
  
  a0b5ab7c
- 后台 · 68b8215f
  jiaorz authored Nov 11, 2019
  
  68b8215f
- Merge branch 'master-bacground-im' into dev · cddb3ed9
  jiaorz authored Nov 11, 2019
  
  cddb3ed9
- 后台 · fd0760d2
  jiaorz authored Nov 11, 2019
  
  fd0760d2
- 后台 · 5a1fdf0f
  jiaorz authored Nov 11, 2019
  
  5a1fdf0f
- Merge branch 'master-bacground-im' into dev · 5713cef5
  jiaorz authored Nov 11, 2019
  
  5713cef5
- 后台 · 79391ecc
  jiaorz authored Nov 11, 2019
  
  79391ecc
- 修改订单统计 · a91c6abc
  hanfeng authored Nov 11, 2019
  
  a91c6abc