Commits · 5b73376f95cbbf6632c0532d6198321ea3b2c06f · youjj / cloud-platform

21 Nov, 2019 5 commits
- Merge branch 'master-arrival-bug' into dev · 5b73376f
  周健威 authored Nov 21, 2019
  
  5b73376f
- Merge remote-tracking branch 'origin/master-arrival-bug' into master-arrival-bug · 1fe8b08f
  周健威 authored Nov 21, 2019
  
  1fe8b08f
- 添加实际还车交车记录比较 · 4abe4d20
  周健威 authored Nov 21, 2019
  
  4abe4d20
- Merge branch 'master-vehicle-bg' into dev · ce03b87a
  jiaorz authored Nov 21, 2019
  
  ce03b87a
- 车辆信息统计 · 626738d6
  jiaorz authored Nov 21, 2019
  
  626738d6
20 Nov, 2019 31 commits
- Merge branch 'master-arrival-bug' into master-vehicle-bg · 902edcc8
  jiaorz authored Nov 20, 2019
  
  902edcc8
- 还车修改 · b07411ca
  jiaorz authored Nov 20, 2019
  
  b07411ca
- Merge branch 'master' into master-vehicle-bg · b6425529
  jiaorz authored Nov 20, 2019
  
  b6425529
- Merge remote-tracking branch 'origin/dev' into dev · 0ba2555c
  jiaorz authored Nov 20, 2019
  
  0ba2555c
- Merge branch 'master-arrival-bug' into dev · eeac15a4
  jiaorz authored Nov 20, 2019
  
  eeac15a4
- Merge remote-tracking branch 'origin/master-arrival-bug' into master-arrival-bug · ac8678b1
  jiaorz authored Nov 20, 2019
  
  ac8678b1
- 还车修改 · ec4b1071
  jiaorz authored Nov 20, 2019
  
  ec4b1071
- Merge branch 'master-zjw' into dev · 53208bee
  周健威 authored Nov 20, 2019
  
  53208bee
- 修复同时归还免费天数和优惠券bug · d63a8041
  周健威 authored Nov 20, 2019
  
  d63a8041
- 添加描述 · 987f8093
  周健威 authored Nov 20, 2019
  
  987f8093
- Merge branch 'master-arrival-bug' into dev · f98c7a45
  jiaorz authored Nov 20, 2019
  
  f98c7a45
- 订单详情异常 · 04d025c6
  jiaorz authored Nov 20, 2019
  
  04d025c6
- 邮件日志记录 · c0d13215
  jiaorz authored Nov 20, 2019
  
  c0d13215
- Merge branch 'master-background-bug' into dev · 6960ff07
  jiaorz authored Nov 20, 2019
  
  6960ff07
- 邮件日志记录 · d962307e
  jiaorz authored Nov 20, 2019
  
  d962307e
- 添加还车取消当天预定限制 · 08c48da6
  jiaorz authored Nov 20, 2019
  
  08c48da6
- 添加出车还车日志 · 92bed955
  jiaorz authored Nov 20, 2019
  
  92bed955
- Merge branch 'master-background-bug' into dev · 08a4cb3b
  jiaorz authored Nov 20, 2019
  
  08a4cb3b
- 添加出车还车日志 · 6e5144da
  jiaorz authored Nov 20, 2019
  
  6e5144da
- 添加出车还车日志 · a01efcce
  jiaorz authored Nov 20, 2019
  
  a01efcce
- 添加 · f3c8fdfa
  jiaorz authored Nov 20, 2019
  
  f3c8fdfa
- Merge remote-tracking branch 'origin/dev' into dev · 11da718f
  jiaorz authored Nov 20, 2019
  
  11da718f
- 添加 · b7fae0aa
  jiaorz authored Nov 20, 2019
  
  b7fae0aa
- Merge remote-tracking branch 'origin/dev' into dev · 32b9464c
  hanfeng authored Nov 20, 2019
  
  32b9464c
- 车辆 · 664eb50f
  hanfeng authored Nov 20, 2019
  
  664eb50f
- 添加 · 56506ca8
  jiaorz authored Nov 20, 2019
  
  56506ca8
- Merge branch 'master' into dev · d80957ac
  jiaorz authored Nov 20, 2019
  
  d80957ac
- 添加 · 74bfc282
  jiaorz authored Nov 20, 2019
  
  74bfc282
- 解决冲突 · 1fa7d5bd
  hanfeng authored Nov 20, 2019
  
  1fa7d5bd
- 解决冲突 · 53b57bbf
  hanfeng authored Nov 20, 2019
  
  53b57bbf
- Merge branch 'master' into dev · 50f4e1c0
  hanfeng authored Nov 20, 2019
  
  50f4e1c0
19 Nov, 2019 4 commits
- Merge branch 'master-bg-update' · 2f8fb67a
  jiaorz authored Nov 19, 2019
  
  2f8fb67a
- Merge remote-tracking branch 'origin/master' · d775cf01
  hanfeng authored Nov 19, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
```
  d775cf01
- Merge remote-tracking branch 'origin/dev' into dev · 92b4268a
  jiaorz authored Nov 19, 2019
  
  92b4268a
- Merge branch 'master-bg-update' into dev · 77cc42ce
  jiaorz authored Nov 19, 2019
  
  77cc42ce