Commits · 765acaad150c67e60b46c6b81f4da0098b82d6f7 · youjj / cloud-platform

23 Aug, 2019 22 commits
- 123 · 765acaad
  hezhen authored Aug 23, 2019
  
  765acaad
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 355c3d3e
  hezhen authored Aug 23, 2019
  
  355c3d3e
- 123 · 4fc3777a
  hezhen authored Aug 23, 2019
  
  4fc3777a
- companybase 字段添加 · adba6369
  libin authored Aug 23, 2019
  
  adba6369
- companybase 字段添加 · 420dc953
  libin authored Aug 23, 2019
  
  420dc953
- companybase 字段添加 · 16317ea3
  libin authored Aug 23, 2019
  
  16317ea3
- companybase 字段添加 · 37628a5c
  libin authored Aug 23, 2019
  
  37628a5c
- Merge branch 'hz_dev' into base-modify · 1faf4505
  hezhen authored Aug 23, 2019
  
  1faf4505
- Merge branch 'dev' into base-modify · f1df06ae
  hezhen authored Aug 23, 2019
  
  f1df06ae
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 3a9c5cf1
  libin authored Aug 23, 2019
  
  3a9c5cf1
- 股权 · 4b400f9a
  libin authored Aug 23, 2019
  
  4b400f9a
- 123 · 80430f91
  hezhen authored Aug 23, 2019
  
  80430f91
- Merge branch 'dev' into hz_dev · 84c40e22
  hezhen authored Aug 23, 2019
  
  84c40e22
- 股权 · aca2b54b
  libin authored Aug 23, 2019
  
  aca2b54b
- 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
- 123 · 3a86e533
  hezhen authored Aug 23, 2019
  
  3a86e533
22 Aug, 2019 18 commits
- 添加根据model_id排序 · 3e5dffe1
  周健威 authored Aug 22, 2019
  
  3e5dffe1
- 123 · bdf872dd
  hezhen authored Aug 22, 2019
  
  bdf872dd
- 123 · 0b5fac9d
  hezhen authored Aug 22, 2019
  
  0b5fac9d
- Merge branch 'dev' into hz_dev · ec52c7d0
  hezhen authored Aug 22, 2019
  
  ec52c7d0
- Merge branch 'dev' into base-modify · e8a7e860
  hezhen authored Aug 22, 2019
  
  e8a7e860
- Merge branch 'base-modify' into lb_dev · 5628808e
  libin authored Aug 22, 2019
  
  5628808e
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 53879272
  hezhen authored Aug 22, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
```
  53879272
- Merge remote-tracking branch 'origin/base-modify' into base-modify · e7b00a53
  libin authored Aug 22, 2019
  
  e7b00a53
- Merge branch 'hz_dev' into base-modify · 35fb9a50
  hezhen authored Aug 22, 2019
  
  35fb9a50
- 123 · b72733e6
  hezhen authored Aug 22, 2019
  
  b72733e6
- 营地 · 67aedce3
  libin authored Aug 22, 2019
  
  67aedce3
- 车辆预定重新排班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 branch 'dev' into hz_dev · 77ae591a
  hezhen authored Aug 22, 2019
  
  77ae591a
- 营地 · 3f703cb9
  libin authored Aug 22, 2019
  
  3f703cb9
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 9561bc88
  jiaorz authored Aug 22, 2019
  
  9561bc88
- 车辆预定重新排班bug · e31a73bb
  jiaorz authored Aug 22, 2019
  
  e31a73bb