Commits · b301d2f3fe7373434175071fecc7a979a89f8c54 · youjj / cloud-platform

14 Oct, 2019 13 commits
- 修改订单统计 · b301d2f3
  hanfeng authored Oct 14, 2019
  
  b301d2f3
- 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_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
- 修改峰会列表 · f2b741b4
  hanfeng authored Oct 14, 2019
  
  f2b741b4
- 修改峰会列表 · c33b9ac0
  hanfeng authored Oct 14, 2019
  
  c33b9ac0
- 修改图片批量上传 · 066fbf65
  hanfeng authored Oct 14, 2019
  
  066fbf65
- 修改图片批量上传 · 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 15 commits
- 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
- 修改订单统计 · eeede000
  hanfeng authored Oct 12, 2019
  
  eeede000
- Merge remote-tracking branch 'origin/dev' into dev · cd54c488
  hanfeng authored Oct 12, 2019
  
  cd54c488
- Merge branch 'master-order-statistics' into dev · e5483e03
  hanfeng authored Oct 12, 2019
  
  e5483e03
- 修改订单统计 · b742e507
  hanfeng authored Oct 12, 2019
  
  b742e507
- 修改订单统计 · 8d1e602d
  hanfeng authored Oct 12, 2019
  
  8d1e602d
- 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 12 commits
- Merge branch 'master_activity' into dev · a6afcfbc
  hezhen authored Oct 11, 2019
  
  a6afcfbc
- Merge branch 'master_activity' into base-modify · c393f4a5
  hezhen authored Oct 11, 2019
  
  c393f4a5
- 123 · c4f966ed
  hezhen authored Oct 11, 2019
  
  c4f966ed
- Merge branch 'master_activity' into base-modify · eec83c9e
  hezhen authored Oct 11, 2019
  
  eec83c9e
- 123 · ed1ce9c1
  hezhen authored Oct 11, 2019
  
  ed1ce9c1
- Merge branch 'master_activity' into base-modify · d2937dd9
  hezhen authored Oct 11, 2019
  
  d2937dd9
- 123 · b5b5eaa0
  hezhen authored Oct 11, 2019
  
  b5b5eaa0
- Merge branch 'master_activity' into base-modify · 769780aa
  hezhen authored Oct 11, 2019
  
  769780aa
- 123 · 9dfbe212
  hezhen authored Oct 11, 2019
  
  9dfbe212
- Merge branch 'master_activity' into base-modify · 41f819a6
  hezhen authored Oct 11, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java
```
  41f819a6
- 123 · 3fe78583
  hezhen authored Oct 11, 2019
  
  3fe78583
- 123 · 3172167e
  hezhen authored Oct 11, 2019
  
  3172167e