Commits · 94445b4e46af564de7d8f12d9f5c071bf7543e91 · youjj / cloud-platform · GitLab

23 Oct, 2019 24 commits
- Merge branch 'master-background-manager' into base-modify · 94445b4e
  jiaorz authored Oct 23, 2019
  
  94445b4e
- 添加根据预定记录ID获取出行记录接口 · 7603eb1e
  jiaorz authored Oct 23, 2019
  
  7603eb1e
- 添加根据预定记录ID获取出行记录接口 · 9c1696b2
  jiaorz authored Oct 23, 2019
  
  9c1696b2
- Merge branch 'master-background-manager' into base-modify · 394774ad
  jiaorz authored Oct 23, 2019
  
  394774ad
- 添加根据预定记录ID获取出行记录接口 · af0864ad
  jiaorz authored Oct 23, 2019
  
  af0864ad
- 添加根据预定记录ID获取出行记录接口 · 6355212d
  jiaorz authored Oct 23, 2019
  
  6355212d
- 添加根据预定记录ID获取出行记录接口 · b3c057d2
  jiaorz authored Oct 23, 2019
  
  b3c057d2
- 添加根据预定记录ID获取出行记录接口 · c39e7efc
  jiaorz authored Oct 23, 2019
  
  c39e7efc
- 添加根据预定记录ID获取出行记录接口 · 7d8885ab
  jiaorz authored Oct 23, 2019
  
  7d8885ab
- 添加根据预定记录ID获取出行记录接口 · 1d54f0b0
  jiaorz authored Oct 23, 2019
  
  1d54f0b0
- 添加根据预定记录ID获取出行记录接口 · 2342fe65
  jiaorz authored Oct 23, 2019
  
  2342fe65
- 添加根据预定记录ID获取出行记录接口 · 2b1245d2
  jiaorz authored Oct 23, 2019
  
  2b1245d2
- Merge branch 'master-background-manager' into base-modify · 4c0e3b1b
  jiaorz authored Oct 23, 2019
  
  4c0e3b1b
- 添加根据预定记录ID获取出行记录接口 · a776d698
  jiaorz authored Oct 23, 2019
  
  a776d698
- Merge branch 'master-background-manager' into base-modify · c775682d
  jiaorz authored Oct 23, 2019
  
  c775682d
- 添加根据预定记录ID获取出行记录接口 · 3b21fcd4
  jiaorz authored Oct 23, 2019
  
  3b21fcd4
- Merge branch 'master-background-manager' into base-modify · 06400ead
  jiaorz authored Oct 23, 2019
  
  06400ead
- 添加根据预定记录ID获取出行记录接口 · 1ff3c65d
  jiaorz authored Oct 23, 2019
  
  1ff3c65d
- Merge branch 'master-background-manager' into base-modify · f1e14196
  jiaorz authored Oct 23, 2019
  
  f1e14196
- 添加根据预定记录ID获取出行记录接口 · 0f53c623
  jiaorz authored Oct 23, 2019
  
  0f53c623
- Merge branch 'master-background-manager' into base-modify · a1f46d10
  jiaorz authored Oct 23, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
```
  a1f46d10
- 添加根据预定记录ID获取出行记录接口 · 06ff2932
  jiaorz authored Oct 23, 2019
  
  06ff2932
- Merge branch 'master-count-vehicle' into base-modify · a696b29f
  jiaorz authored Oct 23, 2019
  
  a696b29f
- 添加根据预定记录ID获取出行记录接口 · 26c25e0d
  jiaorz authored Oct 23, 2019
  
  26c25e0d
22 Oct, 2019 7 commits
- 添加根据预定记录ID获取出行记录接口 · eff78a82
  jiaorz authored Oct 22, 2019
  
  eff78a82
- 添加根据预定记录ID获取出行记录接口 · 1e5dd854
  jiaorz authored Oct 22, 2019
  
  1e5dd854
- 添加根据预定记录ID获取出行记录接口 · f0156e6d
  jiaorz authored Oct 22, 2019
  
  f0156e6d
- 添加根据预定记录ID获取出行记录接口 · 5b7c75c9
  jiaorz authored Oct 22, 2019
  
  5b7c75c9
- 添加修改停靠公司调度记录 · 7f41531f
  jiaorz authored Oct 22, 2019
  
  7f41531f
- 添加修改停靠公司调度记录 · bad6df77
  jiaorz authored Oct 22, 2019
  
  bad6df77
- 添加修改停靠公司调度记录 · 612bcb5a
  jiaorz authored Oct 22, 2019
  
  612bcb5a
21 Oct, 2019 9 commits
- Merge branch 'master-count-vehicle' into base-modify · bc74927a
  jiaorz authored Oct 21, 2019
  
  bc74927a
- 添加修改停靠公司调度记录 · c9cde665
  jiaorz authored Oct 21, 2019
  
  c9cde665
- Merge branch 'master-count-vehicle' into base-modify · dd1f5c04
  jiaorz authored Oct 21, 2019
  
  dd1f5c04
- 添加修改停靠公司调度记录 · 4e8f9ac6
  jiaorz authored Oct 21, 2019
  
  4e8f9ac6
- Merge branch 'master_activity' into base-modify · e0892425
  hanfeng authored Oct 21, 2019
  
  e0892425
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 1da22669
  hanfeng authored Oct 21, 2019
  
  1da22669
- 修改订单统计 · 1559d771
  hanfeng authored Oct 21, 2019
  
  1559d771
- Merge branch 'master-order-statistics' into base-modify · d9c273e6
  hanfeng authored Oct 21, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/test/java/ServiceTest.java
```
  d9c273e6
- Merge branch 'master-count-vehicle' into base-modify · 03daeba8
  jiaorz authored Oct 21, 2019
  
  03daeba8