Commits · 4a471242265aee60a3382d64828f61a87bcb73b0 · youjj / cloud-platform

28 Oct, 2020 21 commits
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 4a471242
  hezhen authored Oct 28, 2020
  
  4a471242
- 123 · 3dcca720
  hezhen authored Oct 28, 2020
  
  3dcca720
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · 66cc4779
  周健威 authored Oct 28, 2020
  
  66cc4779
- 修改租车接口 · f194fbeb
  周健威 authored Oct 28, 2020
  
  f194fbeb
- 123 · 1f51556f
  hezhen authored Oct 28, 2020
  
  1f51556f
- 123 · 4940d715
  hezhen authored Oct 28, 2020
  
  4940d715
- 123 · f5f71f38
  hezhen authored Oct 28, 2020
  
  f5f71f38
- 123 · 81d025b0
  hezhen authored Oct 28, 2020
  
  81d025b0
- 123 · 0f675c7f
  hezhen authored Oct 28, 2020
  
  0f675c7f
- 123 · b2456d17
  hezhen authored Oct 28, 2020
  
  b2456d17
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 3ea1b53c
  hezhen authored Oct 28, 2020
  
  3ea1b53c
- 123 · f4f482f0
  hezhen authored Oct 28, 2020
  
  f4f482f0
- 修改租车接口 · cd38a860
  周健威 authored Oct 28, 2020
  
  cd38a860
- 修改租车接口 · 3d2a68df
  周健威 authored Oct 28, 2020
  
  3d2a68df
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · a247e241
  周健威 authored Oct 28, 2020
  
  a247e241
- 修改租车接口 · bf79cf8c
  周健威 authored Oct 28, 2020
  
  bf79cf8c
- 添加车辆排班 · 5b555442
  hezhen authored Oct 28, 2020
  
  5b555442
- 123 · 1191470b
  hezhen authored Oct 28, 2020
  
  1191470b
- 123 · 8eb52235
  hezhen authored Oct 28, 2020
  
  8eb52235
- 123 · b88b5bcd
  hezhen authored Oct 28, 2020
  
  b88b5bcd
- 修改收藏 · 8c89acf5
  hezhen authored Oct 28, 2020
  
  8c89acf5
27 Oct, 2020 14 commits
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · 657bfda9
  周健威 authored Oct 27, 2020
  
  657bfda9
- 修改租车和申请接口 · 321a895b
  周健威 authored Oct 27, 2020
  
  321a895b
- 123 · e5269e88
  hezhen authored Oct 27, 2020
  
  e5269e88
- 123 · 0c59f326
  hezhen authored Oct 27, 2020
  
  0c59f326
- 123 · 0e1a8371
  hezhen authored Oct 27, 2020
  
  0e1a8371
- 123 · fdf85516
  hezhen authored Oct 27, 2020
  
  fdf85516
- 123 · 5daa3094
  hezhen authored Oct 27, 2020
  
  5daa3094
- 123 · 8a811c4f
  hezhen authored Oct 27, 2020
  
  8a811c4f
- 123 · 74c3ccf1
  hezhen authored Oct 27, 2020
  
  74c3ccf1
- 123 · 58269f10
  hezhen authored Oct 27, 2020
  
  58269f10
- 123 · 8a77abc7
  hezhen authored Oct 27, 2020
  
  8a77abc7
- 123 · eab52a04
  hezhen authored Oct 27, 2020
  
  eab52a04
- 123 · f0693d85
  hezhen authored Oct 27, 2020
  
  f0693d85
- 添加角色 · d34a75fb
  hezhen authored Oct 27, 2020
  
  d34a75fb
26 Oct, 2020 5 commits
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · c5cc9a3c
  hezhen authored Oct 26, 2020
  
  c5cc9a3c
- 修改商品经营申请 · afdaae23
  hezhen authored Oct 26, 2020
  
  afdaae23
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · ddedcb87
  周健威 authored Oct 26, 2020
  
  ddedcb87
- 用户信息接口、日价格接口 · d24022e1
  周健威 authored Oct 26, 2020
  
  d24022e1
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · bcc28dea
  hezhen authored Oct 26, 2020
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java
```
  bcc28dea