Commits · a5af6fe1057a8a5274465b554977192267b926a1 · youjj / cloud-platform

28 Aug, 2020 12 commits
- Merge remote-tracking branch 'origin/dev-tiande' into dev-tiande · a5af6fe1
  unset authored Aug 28, 2020
  
  a5af6fe1
- Merge branch 'master-vehicle-price' into dev-tiande · 9a822bc3
  unset authored Aug 28, 2020
```
# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
```
  9a822bc3
- 修改车辆节假日价格信息 · 9571e0db
  unset authored Aug 28, 2020
  
  9571e0db
- Merge branch 'master-tiande' into dev-tiande · c45d9a87
  hezhen authored Aug 28, 2020
  
  c45d9a87
- 添加旅游 · ac3f0a4a
  hezhen authored Aug 28, 2020
  
  ac3f0a4a
- 一车一价前台接口、下单 · ad3606ab
  周健威 authored Aug 28, 2020
  
  ad3606ab
- Merge branch 'master-tiande' into dev-tiande · 169619da
  hezhen authored Aug 28, 2020
  
  169619da
- 添加旅游模块 · 80e05c95
  hezhen authored Aug 28, 2020
  
  80e05c95
- Merge branch 'master-vehicle-price' into dev-tiande · a7894d1f
  unset authored Aug 28, 2020
  
  a7894d1f
- 修改车辆信息 · 073b34b3
  unset authored Aug 28, 2020
  
  073b34b3
- Merge branch 'master-vehicle-price' into dev-tiande · 154806c7
  unset authored Aug 28, 2020
  
  154806c7
- 修改车辆信息 · 3db42a5a
  unset authored Aug 28, 2020
  
  3db42a5a
27 Aug, 2020 28 commits
- 修改车辆信息 · cc7e00be
  unset authored Aug 27, 2020
  
  cc7e00be
- Merge branch 'master-vehicle-price' into dev-tiande · ad59aaa9
  unset authored Aug 27, 2020
  
  ad59aaa9
- 修改车辆信息 · 94ee7090
  unset authored Aug 27, 2020
  
  94ee7090
- Merge branch 'master-vehicle-price' into dev-tiande · f7a700de
  unset authored Aug 27, 2020
  
  f7a700de
- 修改车辆信息 · 0ecd125b
  unset authored Aug 27, 2020
  
  0ecd125b
- Merge branch 'master-vehicle-price' into dev-tiande · 4cad1c3a
  unset authored Aug 27, 2020
  
  4cad1c3a
- 修改车辆信息 · 187f6544
  unset authored Aug 27, 2020
  
  187f6544
- Merge remote-tracking branch 'origin/dev-tiande' into dev-tiande · 6ce0909b
  unset authored Aug 27, 2020
  
  6ce0909b
- Merge branch 'master-vehicle-price' into dev-tiande · cf3ded19
  unset authored Aug 27, 2020
  
  cf3ded19
- 修改车辆信息 · b0df4bd4
  unset authored Aug 27, 2020
  
  b0df4bd4
- Merge branch 'dev-tiande' of http://113.105.137.151:22280/youjj/cloud-platform into dev-tiande · b151d706
  hezhen authored Aug 27, 2020
  
  b151d706
- Merge branch 'master-tiande' into dev-tiande · 0bac1cf4
  hezhen authored Aug 27, 2020
  
  0bac1cf4
- 123 · c4e745e3
  hezhen authored Aug 27, 2020
  
  c4e745e3
- 123 · fce503ef
  hezhen authored Aug 27, 2020
  
  fce503ef
- Merge branch 'master-vehicle-price' into dev-tiande · 56db3ee2
  unset authored Aug 27, 2020
  
  56db3ee2
- 修改车辆信息 · 6524006d
  unset authored Aug 27, 2020
  
  6524006d
- Merge branch 'master-tiande' into dev-tiande · 8f1a8c76
  hezhen authored Aug 27, 2020
  
  8f1a8c76
- 修改用户列表 · 98c103f2
  hezhen authored Aug 27, 2020
  
  98c103f2
- Merge remote-tracking branch 'origin/dev-tiande' into dev-tiande · 37aba6fb
  unset authored Aug 27, 2020
  
  37aba6fb
- 修改车辆信息 · dac6f659
  unset authored Aug 27, 2020
  
  dac6f659
- Merge branch 'master-tiande' into dev-tiande · 09699767
  hezhen authored Aug 27, 2020
  
  09699767
- 添加后台用户列表 · 84dbb58c
  hezhen authored Aug 27, 2020
  
  84dbb58c
- Merge branch 'master-vehicle-price' into dev-tiande · 0e86921d
  unset authored Aug 27, 2020
  
  0e86921d
- 修改车辆信息 · ac5bde92
  unset authored Aug 27, 2020
  
  ac5bde92
- Merge branch 'master-vehicle-price' into dev-tiande · fb981f47
  unset authored Aug 27, 2020
  
  fb981f47
- 修改车辆信息 · 2d68fe41
  unset authored Aug 27, 2020
  
  2d68fe41
- Merge remote-tracking branch 'origin/dev-tiande' into dev-tiande · 365974c2
  unset authored Aug 27, 2020
  
  365974c2
- Merge branch 'master-vehicle-price' into dev-tiande · 67260615
  unset authored Aug 27, 2020
  
  67260615