Commits · f6eeff507d56d83fa3e245f6d74467759f2c3957 · youjj / cloud-platform

19 Aug, 2019 7 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · f6eeff50
  libin authored Aug 19, 2019
  
  f6eeff50
- 旅游核销校验 · 6aa73e0d
  libin authored Aug 19, 2019
  
  6aa73e0d
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 29cd4638
  jiaorz authored Aug 19, 2019
  
  29cd4638
- 取消预定和出车的bug · c8d8c319
  jiaorz authored Aug 19, 2019
  
  c8d8c319
- token · c9ec18b7
  libin authored Aug 19, 2019
  
  c9ec18b7
- 取消预定和出车的bug · facbf060
  jiaorz authored Aug 19, 2019
  
  facbf060
- 取消预定和出车的bug · 7cc1d20a
  jiaorz authored Aug 19, 2019
  
  7cc1d20a
17 Aug, 2019 12 commits
- 取消预定和出车的bug · e3cc0618
  jiaorz authored Aug 17, 2019
  
  e3cc0618
- 取消预定和出车的bug · 9d964acd
  jiaorz authored Aug 17, 2019
  
  9d964acd
- 取消预定和出车的bug · 121bf3b6
  jiaorz authored Aug 17, 2019
  
  121bf3b6
- 取消预定和出车的bug · a6faeb03
  jiaorz authored Aug 17, 2019
  
  a6faeb03
- 取消预定和出车的bug · 70798399
  jiaorz authored Aug 17, 2019
  
  70798399
- Merge remote-tracking branch 'origin/dev' into dev · 17448e2f
  jiaorz authored Aug 17, 2019
  
  17448e2f
- 取消预定和出车的bug · d7cfcda3
  jiaorz authored Aug 17, 2019
  
  d7cfcda3
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · bb8f0d73
  hanfeng authored Aug 17, 2019
  
  bb8f0d73
- 修改后台设置会员信息 · ad43a89d
  hanfeng authored Aug 17, 2019
  
  ad43a89d
- 取消预定和出车的bug · e0eb276d
  jiaorz authored Aug 17, 2019
  
  e0eb276d
- Merge remote-tracking branch 'origin/dev' into dev · 9021cf75
  jiaorz authored Aug 17, 2019
  
  9021cf75
- 取消预定和出车的bug · e1855e5a
  jiaorz authored Aug 17, 2019
  
  e1855e5a
16 Aug, 2019 21 commits
- 修改拒绝bug · 90c66869
  周健威 authored Aug 16, 2019
  
  90c66869
- Merge remote-tracking branch 'origin/dev' into dev · 9d8c4d11
  周健威 authored Aug 16, 2019
  
  9d8c4d11
- 修改重新配车bug · 1cd8cb8c
  周健威 authored Aug 16, 2019
  
  1cd8cb8c
- 消息队列bug · 31809050
  jiaorz authored Aug 16, 2019
  
  31809050
- 消息队列bug · 1f1ae39b
  jiaorz authored Aug 16, 2019
  
  1f1ae39b
- Merge remote-tracking branch 'origin/dev' into dev · e5ee6cf4
  jiaorz authored Aug 16, 2019
  
  e5ee6cf4
- 消息队列bug · fa65c2ad
  jiaorz authored Aug 16, 2019
  
  fa65c2ad
- Merge remote-tracking branch 'origin/dev' into dev · dcde4b65
  周健威 authored Aug 16, 2019
  
  dcde4b65
- 修改重新配车bug · 516be23a
  周健威 authored Aug 16, 2019
  
  516be23a
- Merge remote-tracking branch 'origin/dev' into dev · 897c6d95
  jiaorz authored Aug 16, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
```
  897c6d95
- 消息队列修改 · 92d3c9f6
  jiaorz authored Aug 16, 2019
  
  92d3c9f6
- Merge remote-tracking branch 'origin/dev' into dev · 8f479f95
  周健威 authored Aug 16, 2019
  
  8f479f95
- 修改取消预约的时间检测问题 · bd8f4c2f
  周健威 authored Aug 16, 2019
  
  bd8f4c2f
- 消息队列修改 · 601449d3
  jiaorz authored Aug 16, 2019
  
  601449d3
- Merge remote-tracking branch 'origin/dev' into dev · da133f24
  jiaorz authored Aug 16, 2019
  
  da133f24
- 添加驳回预定申请理由 · 2e77cb32
  jiaorz authored Aug 16, 2019
  
  2e77cb32
- 修改租车触发预约代码 · 95c1d03b
  周健威 authored Aug 16, 2019
  
  95c1d03b
- Merge remote-tracking branch 'origin/dev' into dev · d7fb790d
  周健威 authored Aug 16, 2019
  
  d7fb790d
- 修改租车触发预约代码 · 9c412e05
  周健威 authored Aug 16, 2019
  
  9c412e05
- Merge remote-tracking branch 'origin/dev' into dev · 87fe03a9
  jiaorz authored Aug 16, 2019
  
  87fe03a9
- 修改租车触发预约代码 · 02b730c0
  周健威 authored Aug 16, 2019
  
  02b730c0