Commits · 63ba3c8a940b5c3d0b8303f42b3eb2797913f5df · youjj / cloud-platform

12 Oct, 2019 6 commits
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 63ba3c8a
  hezhen authored Oct 12, 2019
  
  63ba3c8a
- Merge branch 'master_activity' into dev · 7952dd2d
  hezhen authored Oct 12, 2019
  
  7952dd2d
- 123 · 7e189b94
  hezhen authored Oct 12, 2019
  
  7e189b94
- Merge remote-tracking branch 'origin/dev' into dev · 5026afef
  jiaorz authored Oct 12, 2019
  
  5026afef
- Merge branch 'master-count-vehicle' into dev · 0f0b9984
  jiaorz authored Oct 12, 2019
  
  0f0b9984
- Merge remote-tracking branch 'origin/dev' into dev · e5e96737
  hanfeng authored Oct 12, 2019
  
  e5e96737
11 Oct, 2019 34 commits
- Merge branch 'master_activity' into dev · a6afcfbc
  hezhen authored Oct 11, 2019
  
  a6afcfbc
- 123 · c4f966ed
  hezhen authored Oct 11, 2019
  
  c4f966ed
- 123 · ed1ce9c1
  hezhen authored Oct 11, 2019
  
  ed1ce9c1
- 123 · b5b5eaa0
  hezhen authored Oct 11, 2019
  
  b5b5eaa0
- 123 · 9dfbe212
  hezhen authored Oct 11, 2019
  
  9dfbe212
- 123 · 3fe78583
  hezhen authored Oct 11, 2019
  
  3fe78583
- 123 · 3172167e
  hezhen authored Oct 11, 2019
  
  3172167e
- Merge branch 'master_activity' into dev · 26753f64
  hezhen authored Oct 11, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java
```
  26753f64
- 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
- 修改订单出车时间限制 · 758ed268
  jiaorz authored Oct 11, 2019
  
  758ed268
- Merge branch 'master-count-vehicle' into dev · 66a3daa1
  jiaorz authored Oct 11, 2019
  
  66a3daa1
- 修改订单出车时间限制 · 5fda0d7b
  jiaorz authored Oct 11, 2019
  
  5fda0d7b
- 123 · 5adb2473
  hezhen authored Oct 11, 2019
  
  5adb2473
- Merge branch 'master-zjw' into dev · f13d780d
  周健威 authored Oct 11, 2019
  
  f13d780d
- 修改bug · 365d930c
  周健威 authored Oct 11, 2019
  
  365d930c
- Merge remote-tracking branch 'origin/dev' into dev · fd42ab60
  周健威 authored Oct 11, 2019
  
  fd42ab60
- Merge branch 'master-zjw' into dev · 06c17ed6
  周健威 authored Oct 11, 2019
  
  06c17ed6
- 修改代码 · 6842526b
  周健威 authored Oct 11, 2019
  
  6842526b
- 添加后台修改订单还车公司和预定记录还车公司接口 · a13ca54e
  jiaorz authored Oct 11, 2019
  
  a13ca54e
- 123 · c7c68c5a
  hezhen authored Oct 11, 2019
  
  c7c68c5a
- 123 · bab0ab96
  hezhen authored Oct 11, 2019
  
  bab0ab96
- 添加后台修改订单还车公司和预定记录还车公司接口 · d75e71d8
  jiaorz authored Oct 11, 2019
  
  d75e71d8
- 修改订单统计 · 657202fe
  hanfeng authored Oct 11, 2019
  
  657202fe
- 123 · 1d2a3d35
  hezhen authored Oct 11, 2019
  
  1d2a3d35
- 123 · e3be2ffa
  hezhen authored Oct 11, 2019
  
  e3be2ffa
- 123 · fe27e09c
  hezhen authored Oct 11, 2019
  
  fe27e09c
- Merge remote-tracking branch 'origin/dev' into dev · d10f703c
  hanfeng authored Oct 11, 2019
  
  d10f703c
- Merge branch 'master-order-statistics' into dev · 2897117a
  hanfeng authored Oct 11, 2019
  
  2897117a
- 修改订单统计 · 0c4aba12
  hanfeng authored Oct 11, 2019
  
  0c4aba12
- 123 · 402e1939
  hezhen authored Oct 11, 2019
  
  402e1939
- Merge remote-tracking branch 'origin/dev' into dev · 8d9ff4a9
  周健威 authored Oct 11, 2019
  
  8d9ff4a9
- Merge branch 'master-zjw' into dev · a909e51b
  周健威 authored Oct 11, 2019
  
  a909e51b
- 修改代码 · 9c362930
  周健威 authored Oct 11, 2019
  
  9c362930