Commits · 25d8190c68dbb76543a34b5f0734d99b05312970 · youjj / cloud-platform

19 Jul, 2019 39 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 25d8190c
  libin authored Jul 19, 2019
  
  25d8190c
- 通用配置 · 868a72e0
  libin authored Jul 19, 2019
  
  868a72e0
- 添加积分消息队列接口 · f67abe0d
  jiaorz authored Jul 19, 2019
  
  f67abe0d
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 2c79c114
  jiaorz authored Jul 19, 2019
  
  2c79c114
- 添加积分消息队列接口 · cb3d842b
  jiaorz authored Jul 19, 2019
  
  cb3d842b
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 57a5037c
  周健威 authored Jul 19, 2019
  
  57a5037c
- 修改代码 · 6f3d2e9b
  周健威 authored Jul 19, 2019
  
  6f3d2e9b
- 修改领取优惠卷 · f7e28cbd
  hezhen authored Jul 19, 2019
  
  f7e28cbd
- 修改文件 · a6794c9d
  hezhen authored Jul 19, 2019
  
  a6794c9d
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 85170e22
  jiaorz authored Jul 19, 2019
  
  85170e22
- 添加积分消息队列接口 · 48b8d584
  jiaorz authored Jul 19, 2019
  
  48b8d584
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 264fac02
  周健威 authored Jul 19, 2019
  
  264fac02
- 修改代码 · 96a42bb0
  周健威 authored Jul 19, 2019
  
  96a42bb0
- 添加积分消息队列接口 · 7833928c
  jiaorz authored Jul 19, 2019
  
  7833928c
- 添加积分消息队列接口 · 0e007d09
  jiaorz authored Jul 19, 2019
  
  0e007d09
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 0d63acad
  jiaorz authored Jul 19, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
```
  0d63acad
- 添加积分消息队列接口 · b34105f3
  jiaorz authored Jul 19, 2019
  
  b34105f3
- 添加积分消息队列接口 · 0d7c7f65
  jiaorz authored Jul 19, 2019
  
  0d7c7f65
- 123 · 4e33c6c7
  hezhen authored Jul 19, 2019
  
  4e33c6c7
- 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 1 commit
- Merge remote-tracking branch 'origin/base-modify' into base-modify · c0d21086
  周健威 authored Jul 18, 2019
  
  c0d21086