Commits · ded9ad312a1a81f1f8bd3d169faa464f94ba6c65 · youjj / cloud-platform

08 Jul, 2019 26 commits
- 123 · ded9ad31
  hezhen authored Jul 08, 2019
  
  ded9ad31
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 5fe0482d
  hezhen authored Jul 08, 2019
  
  5fe0482d
- 123 · 5e9511c1
  hezhen authored Jul 08, 2019
  
  5e9511c1
- Merge remote-tracking branch 'origin/base-modify' into base-modify · d8e24089
  周健威 authored Jul 08, 2019
  
  d8e24089
- 修改查车bug · 66a19d52
  周健威 authored Jul 08, 2019
  
  66a19d52
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 83266b81
  hezhen authored Jul 08, 2019
  
  83266b81
- 123 · 51b2c1ba
  hezhen authored Jul 08, 2019
  
  51b2c1ba
- Merge remote-tracking branch 'origin/base-modify' into base-modify · e4409308
  周健威 authored Jul 08, 2019
  
  e4409308
- 修改bug · d2082ec5
  周健威 authored Jul 08, 2019
  
  d2082ec5
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 99da74fb
  hezhen authored Jul 08, 2019
  
  99da74fb
- 123 · da2ccd71
  hezhen authored Jul 08, 2019
  
  da2ccd71
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 5179b3c7
  hanfeng authored Jul 08, 2019
  
  5179b3c7
- 修改app自动跟新后台 · 635d3398
  hanfeng authored Jul 08, 2019
  
  635d3398
- 123 · afae915e
  hezhen authored Jul 08, 2019
  
  afae915e
- 123 · abe748d9
  hezhen authored Jul 08, 2019
  
  abe748d9
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · c7e0a0e8
  hezhen authored Jul 08, 2019
  
  c7e0a0e8
- 123 · fe55ef33
  hezhen authored Jul 08, 2019
  
  fe55ef33
- 修改出游人信息和用户管理 · 81053ac3
  hanfeng authored Jul 08, 2019
  
  81053ac3
- 123 · deaf31b1
  hezhen authored Jul 08, 2019
  
  deaf31b1
- 123 · f26b9878
  hezhen authored Jul 08, 2019
  
  f26b9878
- 123 · c8c6db99
  hezhen authored Jul 08, 2019
  
  c8c6db99
- 123 · 4a930764
  hezhen authored Jul 08, 2019
  
  4a930764
- 123 · ab574c0c
  hezhen authored Jul 08, 2019
  
  ab574c0c
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 3329cd46
  jiaorz authored Jul 08, 2019
  
  3329cd46
- 注册接口修改 · 80757579
  jiaorz authored Jul 08, 2019
  
  80757579
- 注册接口修改 · 9b643891
  jiaorz authored Jul 08, 2019
  
  9b643891
06 Jul, 2019 14 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · eb427261
  hezhen authored Jul 06, 2019
  
  eb427261
- 1233 · db461e19
  hezhen authored Jul 06, 2019
  
  db461e19
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 643db455
  hanfeng authored Jul 06, 2019
  
  643db455
- 修改车型列表接口 · 4490041c
  hanfeng authored Jul 06, 2019
  
  4490041c
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 13b9dc42
  周健威 authored Jul 06, 2019
  
  13b9dc42
- 提供接口 · ecd6eef2
  周健威 authored Jul 06, 2019
  
  ecd6eef2
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · c30e336c
  hezhen authored Jul 06, 2019
  
  c30e336c
- 123 · eef3ea34
  hezhen authored Jul 06, 2019
  
  eef3ea34
- 修改车型列表接口,提供app和小程序接口 · 7c6ccd01
  hanfeng authored Jul 06, 2019
  
  7c6ccd01
- 解决VehicleFeign重复 · 7f8e774a
  hanfeng authored Jul 06, 2019
  
  7f8e774a
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · e24d0747
  hanfeng authored Jul 06, 2019
  
  e24d0747
- 解决冲突 · ec0dcaed
  hanfeng authored Jul 06, 2019
  
  ec0dcaed
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 397f239f
  hanfeng authored Jul 06, 2019
```
# Conflicts:
#	xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/RedisKey.java
#	xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java
```
  397f239f
- 123 · c32d0a4b
  hezhen authored Jul 06, 2019
  
  c32d0a4b