Commits · 39ed4d6fb0f4b2814d4226e596aec21aa86c212a · youjj / cloud-platform

24 Aug, 2019 2 commits
- Merge branch 'master' into dev · 39ed4d6f
  hezhen authored Aug 24, 2019
  
  39ed4d6f
- 123 · cf8eec96
  hezhen authored Aug 24, 2019
  
  cf8eec96
23 Aug, 2019 8 commits
- 123 · 2d193c8d
  hezhen authored Aug 23, 2019
  
  2d193c8d
- 123 · a5f518e4
  hezhen authored Aug 23, 2019
  
  a5f518e4
- 123 · dcc6af2b
  hezhen authored Aug 23, 2019
  
  dcc6af2b
- 123 · 54fba104
  hezhen authored Aug 23, 2019
  
  54fba104
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · e1563239
  hezhen authored Aug 23, 2019
  
  e1563239
- 123 · 05963319
  hezhen authored Aug 23, 2019
  
  05963319
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 49341425
  jiaorz authored Aug 23, 2019
  
  49341425
- 车辆预定重新排班bug · 7e84a66a
  jiaorz authored Aug 23, 2019
  
  7e84a66a
22 Aug, 2019 30 commits
- Merge branch 'dev' into 'master' · 184b6979
  周健威 authored Aug 22, 2019
```
Dev-master-merge

See merge request !11
```
  184b6979
- 添加根据model_id排序 · 3e5dffe1
  周健威 authored Aug 22, 2019
  
  3e5dffe1
- 123 · bdf872dd
  hezhen authored Aug 22, 2019
  
  bdf872dd
- 车辆预定重新排班bug · 233ab582
  jiaorz authored Aug 22, 2019
  
  233ab582
- 车辆预定重新排班bug · a66e8d04
  jiaorz authored Aug 22, 2019
  
  a66e8d04
- 车辆预定重新排班bug · 8fad0e1c
  jiaorz authored Aug 22, 2019
  
  8fad0e1c
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 9561bc88
  jiaorz authored Aug 22, 2019
  
  9561bc88
- 车辆预定重新排班bug · e31a73bb
  jiaorz authored Aug 22, 2019
  
  e31a73bb
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · c19c70b8
  hanfeng authored Aug 22, 2019
  
  c19c70b8
- 修改实名认证 · edd4536f
  hanfeng authored Aug 22, 2019
  
  edd4536f
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 4ee0c367
  jiaorz authored Aug 22, 2019
  
  4ee0c367
- 123 · 487e4af7
  hezhen authored Aug 22, 2019
  
  487e4af7
- 车辆预定重新排班bug · 9f54a858
  jiaorz authored Aug 22, 2019
  
  9f54a858
- 修改日志转换bug · 00126632
  周健威 authored Aug 22, 2019
  
  00126632
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 9f1204d3
  hanfeng authored Aug 22, 2019
  
  9f1204d3
- 修改会员列表 · dc84fa02
  hanfeng authored Aug 22, 2019
  
  dc84fa02
- 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
- 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