Commits · 87fe03a99bf3bac69fae0a3fa224e412cd95ed74 · youjj / cloud-platform

16 Aug, 2019 23 commits
- Merge remote-tracking branch 'origin/dev' into dev · 87fe03a9
  jiaorz authored Aug 16, 2019
  
  87fe03a9
- 修改租车触发预约代码 · 02b730c0
  周健威 authored Aug 16, 2019
  
  02b730c0
- 添加驳回预定申请理由 · dcf14e10
  jiaorz authored Aug 16, 2019
  
  dcf14e10
- Merge remote-tracking branch 'remotes/origin/dev' into base-modify · 4cd6b7e6
  jiaorz authored Aug 16, 2019
  
  4cd6b7e6
- 添加驳回预定申请理由 · a59fdef7
  jiaorz authored Aug 16, 2019
  
  a59fdef7
- Merge remote-tracking branch 'origin/dev' into dev · e227f134
  周健威 authored Aug 16, 2019
  
  e227f134
- 修改代码 · 8a322215
  周健威 authored Aug 16, 2019
  
  8a322215
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 150176f7
  jiaorz authored Aug 16, 2019
  
  150176f7
- 添加积分补充接口 · e25a9580
  jiaorz authored Aug 16, 2019
  
  e25a9580
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 3394d66a
  hezhen authored Aug 16, 2019
  
  3394d66a
- 123 · 4ca75060
  hezhen authored Aug 16, 2019
  
  4ca75060
- 车型 · 7bd53797
  libin authored Aug 16, 2019
  
  7bd53797
- Merge branch 'dev' into base-modify · d6878b03
  libin authored Aug 16, 2019
  
  d6878b03
- Merge remote-tracking branch 'origin/dev' into dev · 9a6cb077
  libin authored Aug 16, 2019
  
  9a6cb077
- 分公司查询bug修复 · 9bc6b75e
  libin authored Aug 16, 2019
  
  9bc6b75e
- Merge remote-tracking branch 'origin/dev' into dev · 0b9a5ef8
  周健威 authored Aug 16, 2019
  
  0b9a5ef8
- 修改代码 · 851c2b2d
  周健威 authored Aug 16, 2019
  
  851c2b2d
- Merge branch 'dev' into base-modify · ba333528
  libin authored Aug 16, 2019
  
  ba333528
- 活动注册id · 50f06362
  libin authored Aug 16, 2019
  
  50f06362
- bannerid · 60e2b2ea
  libin authored Aug 16, 2019
  
  60e2b2ea
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 7487dd39
  libin authored Aug 16, 2019
  
  7487dd39
- bannerid · 1f80c37b
  libin authored Aug 16, 2019
  
  1f80c37b
- 添加积分补充接口 · 5a249dd3
  jiaorz authored Aug 16, 2019
  
  5a249dd3
15 Aug, 2019 17 commits
- 修改bug · 17c6f339
  周健威 authored Aug 15, 2019
  
  17c6f339
- 修改代码 · 8b153e66
  周健威 authored Aug 15, 2019
  
  8b153e66
- Merge remote-tracking branch 'origin/dev' into dev · e0448966
  周健威 authored Aug 15, 2019
  
  e0448966
- 修改代码 · fca055a4
  周健威 authored Aug 15, 2019
  
  fca055a4
- Merge remote-tracking branch 'origin/dev' into dev · 1001e3fe
  jiaorz authored Aug 15, 2019
  
  1001e3fe
- Merge remote-tracking branch 'origin/dev' into dev2 · 010b787f
  hanfeng authored Aug 15, 2019
  
  010b787f
- 修改订单统计 · 54f93ab8
  hanfeng authored Aug 15, 2019
  
  54f93ab8
- 修改代码 · fcd5017e
  周健威 authored Aug 15, 2019
  
  fcd5017e
- 修改代码 · 42a950eb
  周健威 authored Aug 15, 2019
  
  42a950eb
- Merge remote-tracking branch 'origin/dev' into dev · a93ad8d7
  周健威 authored Aug 15, 2019
  
  a93ad8d7
- 修改bug · 1eb7b306
  周健威 authored Aug 15, 2019
  
  1eb7b306
- Merge branch 'master-bug' into dev · 1dd037d7
  周健威 authored Aug 15, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
```
  1dd037d7
- 修改实名认证 · 9d0ed535
  hanfeng authored Aug 15, 2019
  
  9d0ed535
- 添加积分补充接口 · 04540204
  jiaorz authored Aug 15, 2019
  
  04540204
- 修改master 触发租车预约bug · cd8246a9
  周健威 authored Aug 15, 2019
  
  cd8246a9
- 修改实名认证 · 4b162fc0
  hanfeng authored Aug 15, 2019
  
  4b162fc0
- Merge remote-tracking branch 'origin/dev' into dev · 75fd0975
  周健威 authored Aug 15, 2019
  
  75fd0975