Commits · 2acff1683b9042cd7691eadfe50f122871750123 · youjj / cloud-platform

18 Oct, 2019 6 commits
- 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 1 commit
- 修改订单 · 1e2f0651
  hanfeng authored Oct 17, 2019
  
  1e2f0651
14 Oct, 2019 28 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · af7feebe
  hanfeng authored Oct 14, 2019
  
  af7feebe
- 修改订单统计 · b301d2f3
  hanfeng authored Oct 14, 2019
  
  b301d2f3
- 修改订单统计 · e9b827bd
  hanfeng authored Oct 14, 2019
  
  e9b827bd
- 修改峰会列表 · 0cdeae44
  hanfeng authored Oct 14, 2019
  
  0cdeae44
- Merge branch 'master-count-vehicle' into base-modify · 1ef536e7
  jiaorz authored Oct 14, 2019
  
  1ef536e7
- 修改订单出车时间限制 · 5f677bdf
  jiaorz authored Oct 14, 2019
  
  5f677bdf
- Merge remote-tracking branch 'origin/master-order-statistics' into master-order-statistics · 85d45f47
  hanfeng authored Oct 14, 2019
  
  85d45f47
- 修改峰会列表 · d5749980
  hanfeng authored Oct 14, 2019
  
  d5749980
- 修改订单出车时间限制 · 6554e2f3
  jiaorz authored Oct 14, 2019
  
  6554e2f3
- Merge branch 'master_activity' into base-modify · 529b9248
  hanfeng authored Oct 14, 2019
  
  529b9248
- Merge branch 'master_activity' of... · b4b4aa14
  hanfeng authored Oct 14, 2019
```
Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity
```
  b4b4aa14
- 修改峰会列表 · ebee8601
  hanfeng authored Oct 14, 2019
  
  ebee8601
- Merge branch 'master' into master-order-statistics · 9be8a215
  周健威 authored Oct 14, 2019
  
  9be8a215
- Merge remote-tracking branch 'origin/master-order-statistics' into master-order-statistics · d7b3101d
  周健威 authored Oct 14, 2019
  
  d7b3101d
- 修改bug · 177e19b8
  周健威 authored Oct 14, 2019
  
  177e19b8
- Merge branch 'master_activity' of... · e3305c4f
  hezhen authored Oct 14, 2019
```
Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity
```
  e3305c4f
- 123 · 9c2e1d4a
  hezhen authored Oct 14, 2019
  
  9c2e1d4a
- 修改峰会列表 · 358e470c
  hanfeng authored Oct 14, 2019
  
  358e470c
- 修改订单出车时间限制 · 9acc0b32
  jiaorz authored Oct 14, 2019
  
  9acc0b32
- 修改订单出车时间限制 · 94b66e8c
  jiaorz authored Oct 14, 2019
  
  94b66e8c
- 修改峰会列表 · f2b741b4
  hanfeng authored Oct 14, 2019
  
  f2b741b4
- 修改峰会列表 · c33b9ac0
  hanfeng authored Oct 14, 2019
  
  c33b9ac0
- 修改图片批量上传 · 066fbf65
  hanfeng authored Oct 14, 2019
  
  066fbf65
- Merge branch 'master-zjw' · 0a0bec02
  周健威 authored Oct 14, 2019
  
  0a0bec02
- 修改图片批量上传 · d9ca0f53
  hanfeng authored Oct 14, 2019
  
  d9ca0f53
- Merge remote-tracking branch 'origin/master_activity' into master_activity · ba0802ac
  hanfeng authored Oct 14, 2019
  
  ba0802ac
- 修改图片批量上传 · 1434dd54
  hanfeng authored Oct 14, 2019
  
  1434dd54
- 123 · 03af64ab
  hezhen authored Oct 14, 2019
  
  03af64ab
12 Oct, 2019 5 commits

修改订单统计 · 303f31bd
hanfeng authored Oct 12, 2019

303f31bd

Merge remote-tracking branch 'origin/base-modify' into base-modify · 4ee138d0

hanfeng authored Oct 12, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

4ee138d0

Merge branch 'master_activity-hf' into base-modify · a3739ee8

hanfeng authored Oct 12, 2019

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

a3739ee8

Merge branch 'dev' into master_activity-hf · cf1d0e48
hanfeng authored Oct 12, 2019

cf1d0e48

Merge branch 'master_activity' of... · 2d8aaa9c

hanfeng authored Oct 12, 2019

Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity-hf

2d8aaa9c