Commits · eec83c9e1cfe9bdb0bcc457d7a8d1ab735ec931d · youjj / cloud-platform

11 Oct, 2019 40 commits
- Merge branch 'master_activity' into base-modify · eec83c9e
  hezhen authored Oct 11, 2019
  
  eec83c9e
- 123 · ed1ce9c1
  hezhen authored Oct 11, 2019
  
  ed1ce9c1
- Merge branch 'master_activity' into base-modify · d2937dd9
  hezhen authored Oct 11, 2019
  
  d2937dd9
- 123 · b5b5eaa0
  hezhen authored Oct 11, 2019
  
  b5b5eaa0
- Merge branch 'master_activity' into base-modify · 769780aa
  hezhen authored Oct 11, 2019
  
  769780aa
- 123 · 9dfbe212
  hezhen authored Oct 11, 2019
  
  9dfbe212
- Merge branch 'master_activity' into base-modify · 41f819a6
  hezhen authored Oct 11, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java
```
  41f819a6
- 123 · 3fe78583
  hezhen authored Oct 11, 2019
  
  3fe78583
- 123 · 3172167e
  hezhen authored Oct 11, 2019
  
  3172167e
- Merge branch 'master' into master_activity · 28b2b8e1
  hezhen authored Oct 11, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java
```
  28b2b8e1
- 123 · 260558d4
  hezhen authored Oct 11, 2019
  
  260558d4
- Merge branch 'master-count-vehicle' into base-modify · 5c88b77a
  jiaorz authored Oct 11, 2019
  
  5c88b77a
- 修改订单出车时间限制 · 5fda0d7b
  jiaorz authored Oct 11, 2019
  
  5fda0d7b
- Merge branch 'master_activity' into base-modify · b9f01491
  hezhen authored Oct 11, 2019
  
  b9f01491
- 123 · 5adb2473
  hezhen authored Oct 11, 2019
  
  5adb2473
- 添加后台修改订单还车公司和预定记录还车公司接口 · a13ca54e
  jiaorz authored Oct 11, 2019
  
  a13ca54e
- Merge branch 'master_activity' into base-modify · e023a7ec
  hezhen authored Oct 11, 2019
  
  e023a7ec
- 123 · c7c68c5a
  hezhen authored Oct 11, 2019
  
  c7c68c5a
- Merge branch 'master_activity' into base-modify · d7175254
  hezhen authored Oct 11, 2019
  
  d7175254
- 123 · bab0ab96
  hezhen authored Oct 11, 2019
  
  bab0ab96
- 添加后台修改订单还车公司和预定记录还车公司接口 · d75e71d8
  jiaorz authored Oct 11, 2019
  
  d75e71d8
- Merge branch 'master_activity' into base-modify · 98622bc5
  hezhen authored Oct 11, 2019
  
  98622bc5
- 123 · 1d2a3d35
  hezhen authored Oct 11, 2019
  
  1d2a3d35
- Merge branch 'master_activity' into base-modify · 1a64f4fc
  hezhen authored Oct 11, 2019
  
  1a64f4fc
- 123 · e3be2ffa
  hezhen authored Oct 11, 2019
  
  e3be2ffa
- Merge branch 'master_activity' into base-modify · da25c78d
  hezhen authored Oct 11, 2019
  
  da25c78d
- 123 · fe27e09c
  hezhen authored Oct 11, 2019
  
  fe27e09c
- Merge branch 'master_activity' into base-modify · bd83e388
  hezhen authored Oct 11, 2019
  
  bd83e388
- 123 · 402e1939
  hezhen authored Oct 11, 2019
  
  402e1939
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 6e05ad9c
  hezhen authored Oct 11, 2019
  
  6e05ad9c
- Merge branch 'master_activity' into base-modify · e2f32dbc
  hezhen authored Oct 11, 2019
  
  e2f32dbc
- 123 · 8e5524d3
  hezhen authored Oct 11, 2019
  
  8e5524d3
- Merge remote-tracking branch 'origin/base-modify' into base-modify · adfddf09
  hanfeng authored Oct 11, 2019
  
  adfddf09
- Merge branch 'master_activity' into base-modify · 36416a4d
  hezhen authored Oct 11, 2019
  
  36416a4d
- 123 · e131dbe7
  hezhen authored Oct 11, 2019
  
  e131dbe7
- Merge branch 'master_activity' into base-modify · 4f765380
  hezhen authored Oct 11, 2019
  
  4f765380
- Merge branch 'master_activity' of... · a1be36a4
  hezhen authored Oct 11, 2019
```
Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity
```
  a1be36a4
- 123 · 7ac40b38
  hezhen authored Oct 11, 2019
  
  7ac40b38
- Merge branch 'master_activity' into base-modify · 5e2bc8dd
  hezhen authored Oct 11, 2019
  
  5e2bc8dd
- 123 · b0691a90
  hezhen authored Oct 11, 2019
  
  b0691a90