Commits · 1b20114542ebe9a8571009af366510c315cbea32 · youjj / cloud-platform

18 Oct, 2019 3 commits
- 修改订单统计 · 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 37 commits
- 修改订单 · 1e2f0651
  hanfeng authored Oct 17, 2019
  
  1e2f0651
- Merge branch 'master_activity' into dev · d2f9a5d5
  hanfeng authored Oct 17, 2019
  
  d2f9a5d5
- 修改峰会回顾表 · d29933af
  hanfeng authored Oct 17, 2019
  
  d29933af
- 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
- 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
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 563533e6
  hezhen authored Oct 17, 2019
  
  563533e6
- Merge branch 'hz_master' into dev · 1e3de37e
  hezhen authored Oct 17, 2019
  
  1e3de37e
- 促成人查询用户id · 2c84d529
  周健威 authored Oct 17, 2019
  
  2c84d529
- 123 · 4f0003d3
  hezhen authored Oct 17, 2019
  
  4f0003d3
- Merge remote-tracking branch 'origin/dev' into dev · e5e30a7f
  周健威 authored Oct 17, 2019
  
  e5e30a7f
- Merge branch 'master-zjw' into dev · 7c722bba
  周健威 authored Oct 17, 2019
  
  7c722bba
- 添加检索账单时，判断状态为真 · f61d2b20
  周健威 authored Oct 17, 2019
  
  f61d2b20
- Merge branch 'hz_master' into dev · 3009349a
  hezhen authored Oct 17, 2019
  
  3009349a
- 123 · bc40ec79
  hezhen authored Oct 17, 2019
  
  bc40ec79
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 735761f9
  hezhen authored Oct 17, 2019
  
  735761f9
- Merge branch 'hz_master' into dev · f15c6321
  hezhen authored Oct 17, 2019
  
  f15c6321
- 123 · 59eb4ae5
  hezhen authored Oct 17, 2019
  
  59eb4ae5
- Merge branch 'master-bug-hf' into dev · 501823c5
  hanfeng authored Oct 17, 2019
  
  501823c5
- 修改官网新闻和旅游 · 6384f4bf
  hanfeng authored Oct 17, 2019
  
  6384f4bf
- Merge remote-tracking branch 'origin/master' into master-ucc-feature · 8adf75bb
  libin authored Oct 17, 2019
  
  8adf75bb
- Merge remote-tracking branch 'origin/dev' into dev · e070eb4b
  libin authored Oct 17, 2019
  
  e070eb4b
- Merge branch 'master-ucc-feature' into dev · c553ae1d
  libin authored Oct 17, 2019
  
  c553ae1d
- 会员等级 · 8daac259
  libin authored Oct 17, 2019
  
  8daac259
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 85528c08
  hezhen authored Oct 17, 2019
  
  85528c08
- Merge branch 'hz_master' into dev · f89709a5
  hezhen authored Oct 17, 2019
  
  f89709a5
- 123 · 0e718bfe
  hezhen authored Oct 17, 2019
  
  0e718bfe
- Merge remote-tracking branch 'origin/dev' into dev · 89f46b71
  周健威 authored Oct 17, 2019
  
  89f46b71
- Merge branch 'master' into dev · ce2bd0c5
  周健威 authored Oct 17, 2019
  
  ce2bd0c5
- 修复后台下单只能下可租赁的车 · db568e9e
  周健威 authored Oct 17, 2019
  
  db568e9e
- Merge remote-tracking branch 'origin/dev' into dev · 15410b77
  libin authored Oct 17, 2019
  
  15410b77
- Merge branch 'master-auto-pay' into dev · 08383628
  libin authored Oct 17, 2019
  
  08383628