Commits · 03daeba824a2154a47c6a7173ec6c974e171881e · youjj / cloud-platform

21 Oct, 2019 2 commits
- Merge branch 'master-count-vehicle' into base-modify · 03daeba8
  jiaorz authored Oct 21, 2019
  
  03daeba8
- 添 · cc31ddc4
  jiaorz authored Oct 21, 2019
  
  cc31ddc4
18 Oct, 2019 8 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 3cd28d7c
  hanfeng authored Oct 18, 2019
  
  3cd28d7c
- 修改订单统计 · 96657a78
  hanfeng authored Oct 18, 2019
  
  96657a78
- Merge branch 'master-order-statistics' into base-modify · 2acff168
  hanfeng authored Oct 18, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyOrderStatisticsBiz.java
#	xx-order/xx-order-server/src/test/java/ServiceTest.java
```
  2acff168
- 修改订单统计 · dd29b91e
  hanfeng authored Oct 18, 2019
  
  dd29b91e
- 修改订单统计 · 776d3587
  hanfeng authored Oct 18, 2019
  
  776d3587
- 修改订单统计 · 35075e1e
  hanfeng authored Oct 18, 2019
  
  35075e1e
- 修改订单统计 · 28bbcb25
  hanfeng authored Oct 18, 2019
  
  28bbcb25
- 修改订单统计 · 1bf8e44e
  hanfeng authored Oct 18, 2019
  
  1bf8e44e
17 Oct, 2019 28 commits
- 修改订单 · 1e2f0651
  hanfeng authored Oct 17, 2019
  
  1e2f0651
- 添加车架号和发动机号唯一验证 · 6f65126f
  jiaorz authored Oct 17, 2019
  
  6f65126f
- Merge branch 'master-background-manager' into base-modify · 2ba72fb8
  jiaorz authored Oct 17, 2019
  
  2ba72fb8
- 添加车架号和发动机号唯一验证 · 65577c3f
  jiaorz authored Oct 17, 2019
  
  65577c3f
- Merge branch 'master-background-manager' into base-modify · c018eed4
  jiaorz authored Oct 17, 2019
  
  c018eed4
- 出行列表添加出车时间和还车时间筛选 · f974a024
  jiaorz authored Oct 17, 2019
  
  f974a024
- Merge branch 'master-background-manager' into base-modify · 63337ed9
  jiaorz authored Oct 17, 2019
  
  63337ed9
- 出行列表添加出车时间和还车时间筛选 · 3748b1fb
  jiaorz authored Oct 17, 2019
  
  3748b1fb
- Merge branch 'master-background-manager' into base-modify · 914725f5
  jiaorz authored Oct 17, 2019
  
  914725f5
- 出行列表添加出车时间和还车时间筛选 · 6ed7394f
  jiaorz authored Oct 17, 2019
  
  6ed7394f
- Merge branch 'master-background-manager' into base-modify · 341c78e8
  jiaorz authored Oct 17, 2019
  
  341c78e8
- 出行列表添加出车时间和还车时间筛选 · 274d680a
  jiaorz authored Oct 17, 2019
  
  274d680a
- Merge branch 'master-count-vehicle' into base-modify · 24355604
  jiaorz authored Oct 17, 2019
  
  24355604
- 公司列表添加删除过滤 · 2c984854
  jiaorz authored Oct 17, 2019
  
  2c984854
- Merge branch 'master-background-manager' into base-modify · c355268f
  jiaorz authored Oct 17, 2019
  
  c355268f
- 后台功能优化，车辆新加托管人筛选字段 · e1ac72d8
  jiaorz authored Oct 17, 2019
  
  e1ac72d8
- Merge branch 'master-background-manager' into base-modify · 310b3197
  jiaorz authored Oct 17, 2019
  
  310b3197
- 后台功能优化，车辆新加托管人筛选字段 · 01d9d85a
  jiaorz authored Oct 17, 2019
  
  01d9d85a
- Merge branch 'master-background-manager' into base-modify · 72575fb5
  jiaorz authored Oct 17, 2019
  
  72575fb5
- 后台功能优化，车辆新加托管人筛选字段 · 53463de4
  jiaorz authored Oct 17, 2019
  
  53463de4
- Merge branch 'master-count-vehicle' into base-modify · 4265cdd2
  jiaorz authored Oct 17, 2019
  
  4265cdd2
- 后台功能优化，车辆新加托管人筛选字段 · 170f89c9
  jiaorz authored Oct 17, 2019
  
  170f89c9
- Merge branch 'master-background-manager' into base-modify · 6e9ec52f
  jiaorz authored Oct 17, 2019
  
  6e9ec52f
- 后台功能优化，车辆新加托管人筛选字段 · 17886c57
  jiaorz authored Oct 17, 2019
  
  17886c57
- Merge branch 'holiday-price' into base-modify · 8abcf35c
  libin authored Oct 17, 2019
  
  8abcf35c
- 日历价格 · 6d78d0f3
  libin authored Oct 17, 2019
  
  6d78d0f3
- Merge branch 'holiday-price' into base-modify · 042b8003
  libin authored Oct 17, 2019
  
  042b8003
- 车型日历 · 7e46ea87
  libin authored Oct 17, 2019
  
  7e46ea87
16 Oct, 2019 2 commits
- Merge branches 'holiday-price' and 'master-auto-pay' into base-modify · 0b1c3c3c
  libin authored Oct 16, 2019
  
  0b1c3c3c
- 提现账号 · 7be3c65d
  libin authored Oct 16, 2019
  
  7be3c65d