Commits · 92448e05b18aadceeb6fe660e27fc9812439d167 · youjj / cloud-platform

22 Aug, 2019 17 commits
- Merge branch 'dev' into hz_dev · 92448e05
  hezhen authored Aug 22, 2019
  
  92448e05
- Merge remote-tracking branch 'origin/dev' into dev · ebdce88c
  周健威 authored Aug 22, 2019
  
  ebdce88c
- 屏蔽日志打印 · d628b4a9
  周健威 authored Aug 22, 2019
  
  d628b4a9
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 8c8c62ff
  jiaorz authored Aug 22, 2019
  
  8c8c62ff
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · dfcb9fb1
  hezhen authored Aug 22, 2019
  
  dfcb9fb1
- 123 · e80decdc
  hezhen authored Aug 22, 2019
  
  e80decdc
- 核銷bug · eed18238
  jiaorz authored Aug 22, 2019
  
  eed18238
- Merge remote-tracking branch 'origin/dev' into dev · cea825bc
  周健威 authored Aug 22, 2019
  
  cea825bc
- 修改租车检索和触发预定代码 · 1413d477
  周健威 authored Aug 22, 2019
  
  1413d477
- Merge branch 'dev' into hz_dev · 071faad7
  hezhen authored Aug 22, 2019
  
  071faad7
- 123 · cb5eede2
  hezhen authored Aug 22, 2019
  
  cb5eede2
- 123 · f43081ed
  hezhen authored Aug 22, 2019
  
  f43081ed
- 123 · d7d0d288
  hezhen authored Aug 22, 2019
  
  d7d0d288
- 123 · dd84dafb
  hezhen authored Aug 22, 2019
  
  dd84dafb
- Merge remote-tracking branch 'origin/dev' into dev · d58ae4b9
  周健威 authored Aug 22, 2019
  
  d58ae4b9
- 123 · 6408ed28
  hezhen authored Aug 22, 2019
  
  6408ed28
- Merge branch 'dev' into feature-zjw · 4befda9a
  周健威 authored Aug 22, 2019
  
  4befda9a
21 Aug, 2019 9 commits
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 74d3d2b0
  hanfeng authored Aug 21, 2019
  
  74d3d2b0
- 修改根据用户token获取用户会员信息 · 9a9ab593
  hanfeng authored Aug 21, 2019
  
  9a9ab593
- 修改根据用户token获取用户会员信息 · 3fe8a3f7
  hanfeng authored Aug 21, 2019
  
  3fe8a3f7
- 123 · 260bab35
  hezhen authored Aug 21, 2019
  
  260bab35
- Merge remote-tracking branch 'origin/dev' into jrz_dev · a5b32261
  jiaorz authored Aug 21, 2019
  
  a5b32261
- 核銷bug · d655f9e5
  jiaorz authored Aug 21, 2019
  
  d655f9e5
- 修改定损退款的记录状态修改 · 7f487123
  周健威 authored Aug 21, 2019
  
  7f487123
- Merge remote-tracking branch 'origin/dev' into dev · 896ef3c7
  周健威 authored Aug 21, 2019
  
  896ef3c7
- 修改定损退款的记录状态修改 · 81e04056
  周健威 authored Aug 21, 2019
  
  81e04056
20 Aug, 2019 14 commits
- 核銷bug · 74136f9a
  jiaorz authored Aug 20, 2019
  
  74136f9a
- 核銷bug · 6b7af5e1
  jiaorz authored Aug 20, 2019
  
  6b7af5e1
- 核銷bug · 494d74f9
  jiaorz authored Aug 20, 2019
  
  494d74f9
- Merge remote-tracking branch 'origin/dev' into jrz_dev · da611461
  jiaorz authored Aug 20, 2019
  
  da611461
- 核銷bug · b14be048
  jiaorz authored Aug 20, 2019
  
  b14be048
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 86423b00
  hanfeng authored Aug 20, 2019
  
  86423b00
- 修改根据用户token获取用户会员信息 · e369ec69
  hanfeng authored Aug 20, 2019
  
  e369ec69
- 核銷bug · 51110dfb
  jiaorz authored Aug 20, 2019
  
  51110dfb
- Merge remote-tracking branch 'origin/dev' into jrz_dev · d24f53e9
  jiaorz authored Aug 20, 2019
  
  d24f53e9
- 核銷bug · 20636c05
  jiaorz authored Aug 20, 2019
  
  20636c05
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 2e9060be
  hanfeng authored Aug 20, 2019
  
  2e9060be
- 修改获取片区接口 · 6a398291
  hanfeng authored Aug 20, 2019
  
  6a398291
- Merge branch 'dev' into hz_dev · a32ce978
  hezhen authored Aug 20, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
```
  a32ce978
- 修改租车列表新规则bug · 4fb58da6
  周健威 authored Aug 20, 2019
  
  4fb58da6