Commits · e593a87a50cdebe16bdbe7481d5bb720345c51a5 · youjj / cloud-platform

18 Oct, 2019 18 commits
- Merge remote-tracking branch 'origin/dev' into dev · e593a87a
  jiaorz authored Oct 18, 2019
  
  e593a87a
- Merge branch 'master-background-manager' into dev · 0a2aa302
  jiaorz authored Oct 18, 2019
  
  0a2aa302
- 添 · 76aa7b35
  jiaorz authored Oct 18, 2019
  
  76aa7b35
- Merge remote-tracking branch 'origin/dev' into dev · c50b26f2
  libin authored Oct 18, 2019
  
  c50b26f2
- Merge branch 'master-auto-pay' into dev · 70f2452b
  libin authored Oct 18, 2019
  
  70f2452b
- 修改订单统计 · c95ebfe6
  hanfeng authored Oct 18, 2019
  
  c95ebfe6
- 修改订单统计 · 34c79c90
  hanfeng authored Oct 18, 2019
  
  34c79c90
- Merge branch 'master-order-statistics' into dev · e3157153
  hanfeng authored Oct 18, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/test/java/ServiceTest.java
```
  e3157153
- 提现修改 · c69f7885
  libin authored Oct 18, 2019
  
  c69f7885
- 修改订单统计 · dd29b91e
  hanfeng authored Oct 18, 2019
  
  dd29b91e
- Merge branch 'master-order-statistics' into dev · 827f12a8
  hanfeng authored Oct 18, 2019
  
  827f12a8
- 修改订单统计 · 776d3587
  hanfeng authored Oct 18, 2019
  
  776d3587
- 修改订单统计 · 35075e1e
  hanfeng authored Oct 18, 2019
  
  35075e1e
- 修改订单统计 · 28bbcb25
  hanfeng authored Oct 18, 2019
  
  28bbcb25
- Merge remote-tracking branch 'origin/dev' into dev · e419fc79
  hanfeng authored Oct 18, 2019
  
  e419fc79
- 修改订单统计 · 1b201145
  hanfeng authored Oct 18, 2019
  
  1b201145
- Merge branch 'master-order-statistics' into dev · b09c72d1
  hanfeng authored Oct 18, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/test/java/ServiceTest.java
```
  b09c72d1
- 修改订单统计 · 1bf8e44e
  hanfeng authored Oct 18, 2019
  
  1bf8e44e
17 Oct, 2019 22 commits
- 添加车架号和发动机号唯一验证 · 3c315236
  jiaorz authored Oct 17, 2019
  
  3c315236
- Merge branch 'master-background-manager' into dev · 05e849de
  jiaorz authored Oct 17, 2019
  
  05e849de
- 添加车架号和发动机号唯一验证 · fc50347d
  jiaorz authored Oct 17, 2019
  
  fc50347d
- 修改订单 · 1e2f0651
  hanfeng authored Oct 17, 2019
  
  1e2f0651
- 添加车架号和发动机号唯一验证 · 65577c3f
  jiaorz authored Oct 17, 2019
  
  65577c3f
- 出行列表添加出车时间和还车时间筛选 · f974a024
  jiaorz authored Oct 17, 2019
  
  f974a024
- 出行列表添加出车时间和还车时间筛选 · 3748b1fb
  jiaorz authored Oct 17, 2019
  
  3748b1fb
- Merge branch 'master_activity' into dev · d2f9a5d5
  hanfeng authored Oct 17, 2019
  
  d2f9a5d5
- 修改峰会回顾表 · d29933af
  hanfeng authored Oct 17, 2019
  
  d29933af
- 出行列表添加出车时间和还车时间筛选 · 6ed7394f
  jiaorz authored Oct 17, 2019
  
  6ed7394f
- 出行列表添加出车时间和还车时间筛选 · 274d680a
  jiaorz authored Oct 17, 2019
  
  274d680a
- Merge remote-tracking branch 'origin/dev' into dev · f044873d
  hanfeng authored Oct 17, 2019
  
  f044873d
- Merge branch 'master_activity' into dev · 31a8bfec
  hanfeng authored Oct 17, 2019
  
  31a8bfec
- 修改峰会回顾表 · ce4247c4
  hanfeng authored Oct 17, 2019
  
  ce4247c4
- Merge remote-tracking branch 'origin/dev' into dev · ae300919
  libin authored Oct 17, 2019
  
  ae300919
- Merge branch 'master-ucc-feature' into dev · deecf637
  libin authored Oct 17, 2019
  
  deecf637
- 分公司 · 28d8172d
  libin authored Oct 17, 2019
  
  28d8172d
- 后台功能优化，车辆新加托管人筛选字段 · e1ac72d8
  jiaorz authored Oct 17, 2019
  
  e1ac72d8
- 后台功能优化，车辆新加托管人筛选字段 · 01d9d85a
  jiaorz authored Oct 17, 2019
  
  01d9d85a
- 后台功能优化，车辆新加托管人筛选字段 · 53463de4
  jiaorz authored Oct 17, 2019
  
  53463de4
- Merge remote-tracking branch 'origin/dev' into dev · 65c90f03
  周健威 authored Oct 17, 2019
  
  65c90f03
- Merge branch 'master-zjw' into dev · 19fae4cb
  周健威 authored Oct 17, 2019
  
  19fae4cb