Commits · ce507aa1f2dbc236b5551e03841a0bd017cf90fe · youjj / cloud-platform

20 Jul, 2019 21 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · ce507aa1
  libin authored Jul 20, 2019
  
  ce507aa1
- 会员 · 78bc69fa
  libin authored Jul 20, 2019
  
  78bc69fa
- 123 · 4e343c6e
  hezhen authored Jul 20, 2019
  
  4e343c6e
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · c82ed63c
  hezhen authored Jul 20, 2019
  
  c82ed63c
- 123 · 0dafb6dd
  hezhen authored Jul 20, 2019
  
  0dafb6dd
- 123 · 38296d30
  hezhen authored Jul 20, 2019
  
  38296d30
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 32a6175e
  libin authored Jul 20, 2019
  
  32a6175e
- 会员 · 6ee011a9
  libin authored Jul 20, 2019
  
  6ee011a9
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 5a00f250
  hezhen authored Jul 20, 2019
  
  5a00f250
- 123 · bb02fdbc
  hezhen authored Jul 20, 2019
  
  bb02fdbc
- Merge remote-tracking branch 'origin/base-modify' into base-modify · a9b7207d
  周健威 authored Jul 20, 2019
  
  a9b7207d
- 修改代码 · a0dc88e9
  周健威 authored Jul 20, 2019
  
  a0dc88e9
- app自动更新 · 5f52e07d
  hezhen authored Jul 20, 2019
  
  5f52e07d
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 9db4f363
  周健威 authored Jul 20, 2019
  
  9db4f363
- 修改代码 · 31863231
  周健威 authored Jul 20, 2019
  
  31863231
- Merge remote-tracking branch 'origin/base-modify' into base-modify · c43268f2
  jiaorz authored Jul 20, 2019
  
  c43268f2
- 添加积分消息队列接口 · 37aaa9f2
  jiaorz authored Jul 20, 2019
  
  37aaa9f2
- 123 · eeefe9b7
  hezhen authored Jul 20, 2019
  
  eeefe9b7
- 123 · 1a737cef
  hezhen authored Jul 20, 2019
  
  1a737cef
- 123 · 56731e58
  hezhen authored Jul 20, 2019
  
  56731e58
- 修改 · 9635d6e4
  周健威 authored Jul 20, 2019
  
  9635d6e4
19 Jul, 2019 19 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 54c603b9
  hezhen authored Jul 19, 2019
  
  54c603b9
- 123 · 96034f72
  hezhen authored Jul 19, 2019
  
  96034f72
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 81afc78a
  hanfeng authored Jul 19, 2019
  
  81afc78a
- 增加实名认证之后获取积分 · faec7e69
  hanfeng authored Jul 19, 2019
  
  faec7e69
- 添加积分消息队列接口 · 806dba6a
  jiaorz authored Jul 19, 2019
  
  806dba6a
- 123 · 476925db
  hezhen authored Jul 19, 2019
  
  476925db
- 123 · 3a02e3e7
  hezhen authored Jul 19, 2019
  
  3a02e3e7
- 修改实名认证 · e1ccc6e6
  hanfeng authored Jul 19, 2019
  
  e1ccc6e6
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 4916da13
  hanfeng authored Jul 19, 2019
  
  4916da13
- 修改实名认证 · 05516bc3
  hanfeng authored Jul 19, 2019
  
  05516bc3
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 39460a79
  jiaorz authored Jul 19, 2019
  
  39460a79
- Merge remote-tracking branch 'origin/base-modify' into base-modify · e77e760a
  周健威 authored Jul 19, 2019
  
  e77e760a
- 修改 · 544c118d
  周健威 authored Jul 19, 2019
  
  544c118d
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 5741e09e
  jiaorz authored Jul 19, 2019
```
# Conflicts:
#	ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java
#	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java
```
  5741e09e
- 123 · 5514e644
  hezhen authored Jul 19, 2019
  
  5514e644
- 添加积分消息队列接口 · 36307334
  jiaorz authored Jul 19, 2019
  
  36307334
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 3d1453a8
  libin authored Jul 19, 2019
  
  3d1453a8
- banner · f546f31f
  libin authored Jul 19, 2019
  
  f546f31f
- 修改 · a3798099
  周健威 authored Jul 19, 2019
  
  a3798099