Commits · 4ba3bbd4e9074efd5bc6b68d69522eb3cd343d9f · youjj / cloud-platform

19 Jul, 2019 20 commits
- 123 · 4ba3bbd4
  hezhen authored Jul 19, 2019
  
  4ba3bbd4
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · ac04af75
  hezhen authored Jul 19, 2019
  
  ac04af75
- 123 · 5517c796
  hezhen authored Jul 19, 2019
  
  5517c796
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 3ed10439
  libin authored Jul 19, 2019
  
  3ed10439
- 推广*邀请 · 47249efc
  libin authored Jul 19, 2019
  
  47249efc
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 69237a35
  hezhen authored Jul 19, 2019
  
  69237a35
- 123 · f295f1b8
  hezhen authored Jul 19, 2019
  
  f295f1b8
- Merge remote-tracking branch 'origin/base-modify' into base-modify · c2a44c03
  libin authored Jul 19, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
```
  c2a44c03
- mq · 347c9626
  libin authored Jul 19, 2019
  
  347c9626
- 123 · 307c08de
  hezhen authored Jul 19, 2019
  
  307c08de
- 13 · 3a3a8e64
  hezhen authored Jul 19, 2019
  
  3a3a8e64
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 0d078b55
  周健威 authored Jul 19, 2019
  
  0d078b55
- 修改 · 1fb89b3c
  周健威 authored Jul 19, 2019
  
  1fb89b3c
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 81940ccc
  libin authored Jul 19, 2019
  
  81940ccc
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 64eaa163
  hezhen authored Jul 19, 2019
  
  64eaa163
- 123 · df3d569d
  hezhen authored Jul 19, 2019
  
  df3d569d
- 推广*邀请 · d0869036
  libin authored Jul 19, 2019
  
  d0869036
- 添加积分消息队列接口 · 39d85881
  jiaorz authored Jul 19, 2019
  
  39d85881
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 0cce3a82
  jiaorz authored Jul 19, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
#	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/handler/IntegralMQHandler.java
```
  0cce3a82
- 添加积分消息队列接口 · 368ca1e6
  jiaorz authored Jul 19, 2019
  
  368ca1e6
18 Jul, 2019 20 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · c0d21086
  周健威 authored Jul 18, 2019
  
  c0d21086
- 添加推广活动人数统计 · 3c87240a
  周健威 authored Jul 18, 2019
  
  3c87240a
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 80ba36d0
  libin authored Jul 18, 2019
  
  80ba36d0
- 推广*邀请 · 59567d98
  libin authored Jul 18, 2019
  
  59567d98
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 78862201
  周健威 authored Jul 18, 2019
  
  78862201
- 修改 · 992e58c3
  周健威 authored Jul 18, 2019
  
  992e58c3
- 123 · d3fbdc7c
  hezhen authored Jul 18, 2019
  
  d3fbdc7c
- 123 · ef776514
  hezhen authored Jul 18, 2019
  
  ef776514
- 123 · 74295ba6
  hezhen authored Jul 18, 2019
  
  74295ba6
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 58010773
  hezhen authored Jul 18, 2019
  
  58010773
- 添加文件和项目 · 8d701871
  hezhen authored Jul 18, 2019
  
  8d701871
- 添加优惠卷 · fe7d731e
  hezhen authored Jul 18, 2019
  
  fe7d731e
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 855ca91c
  libin authored Jul 18, 2019
  
  855ca91c
- 后台*钱包 · 0d8d3ea7
  libin authored Jul 18, 2019
  
  0d8d3ea7
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 05b38cac
  hanfeng authored Jul 18, 2019
  
  05b38cac
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · e6326a66
  hanfeng authored Jul 18, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
```
  e6326a66
- 修改 · 4e63e50f
  周健威 authored Jul 18, 2019
  
  4e63e50f
- 设置会员等级 · b1201cf0
  hanfeng authored Jul 18, 2019
  
  b1201cf0
- 123 · f926c1bb
  hezhen authored Jul 18, 2019
  
  f926c1bb
- 123 · 81c9d8f4
  hezhen authored Jul 18, 2019
  
  81c9d8f4