Commits · 4e20920b700d7679ff56aa28a5baf24d1f3db175 · youjj / cloud-platform

22 Dec, 2019 3 commits
- Merge branch 'saff_update_feature' into dev · 4e20920b
  libin authored Dec 22, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
```
  4e20920b
- 身份变更 · 25e0d6cc
  libin authored Dec 22, 2019
  
  25e0d6cc
- 身份变更 · 6bdd7a3b
  libin authored Dec 22, 2019
  
  6bdd7a3b
21 Dec, 2019 37 commits
- 身份变更 · 1238119a
  libin authored Dec 21, 2019
  
  1238119a
- 股东mapper.xml提交 · 3c9ad247
  libin authored Dec 21, 2019
  
  3c9ad247
- Merge remote-tracking branch 'origin/saff_update_feature' into saff_update_feature · 74a72936
  libin authored Dec 21, 2019
  
  74a72936
- 身份变更 · 310cc9ae
  libin authored Dec 21, 2019
  
  310cc9ae
- Merge branch 'master-captcha-branch' into dev · 9a219f89
  jiaorz authored Dec 21, 2019
  
  9a219f89
- 活动记录 · 8389261e
  jiaorz authored Dec 21, 2019
  
  8389261e
- Merge branch 'master-activity-bk' into master-captcha-branch · dc2f3944
  jiaorz authored Dec 21, 2019
  
  dc2f3944
- 活动记录 · 487dcc6b
  jiaorz authored Dec 21, 2019
  
  487dcc6b
- 员工信息修改_APP用户列表联动更新 · 421d4707
  zuoyh authored Dec 21, 2019
  
  421d4707
- 验证码图片问题 · 486b105a
  jiaorz authored Dec 21, 2019
  
  486b105a
- Merge branch 'master-captcha-branch' into dev · 3b57799a
  jiaorz authored Dec 21, 2019
  
  3b57799a
- 验证码图片问题 · 5627e09b
  jiaorz authored Dec 21, 2019
  
  5627e09b
- 验证码图片问题 · 604b9e94
  jiaorz authored Dec 21, 2019
  
  604b9e94
- 验证码图片问题 · 5e1dac72
  jiaorz authored Dec 21, 2019
  
  5e1dac72
- Merge remote-tracking branch 'origin/dev' into dev · 5ddabd18
  jiaorz authored Dec 21, 2019
  
  5ddabd18
- 验证码图片问题 · 06101147
  jiaorz authored Dec 21, 2019
  
  06101147
- Merge remote-tracking branch 'origin/dev' into dev · 0b15bf41
  周健威 authored Dec 21, 2019
  
  0b15bf41
- Merge branch 'master-zjw' into dev · 29a03fa5
  周健威 authored Dec 21, 2019
  
  29a03fa5
- 修改转支付bug · c1b05421
  周健威 authored Dec 21, 2019
  
  c1b05421
- Merge remote-tracking branch 'origin/dev' into dev · 5226d818
  周健威 authored Dec 21, 2019
  
  5226d818
- Merge remote-tracking branch 'origin/dev' into dev · caafdffe
  jiaorz authored Dec 21, 2019
  
  caafdffe
- Merge branch 'master-captcha-branch' into dev · 8f856bf6
  jiaorz authored Dec 21, 2019
  
  8f856bf6
- 验证码图片问题 · 4af0845f
  jiaorz authored Dec 21, 2019
  
  4af0845f
- Merge branch 'master-zjw' into dev · 264c65fa
  周健威 authored Dec 21, 2019
  
  264c65fa
- 修改转支付bug · e1276c19
  周健威 authored Dec 21, 2019
  
  e1276c19
- Merge branch 'master-captcha-branch' into dev · 14d5a277
  jiaorz authored Dec 21, 2019
  
  14d5a277
- 验证码图片问题 · 4056af43
  jiaorz authored Dec 21, 2019
  
  4056af43
- 验证码图片问题 · 7c86b335
  jiaorz authored Dec 21, 2019
  
  7c86b335
- Merge branch 'master-captcha-branch' into dev · d27c0f7a
  jiaorz authored Dec 21, 2019
  
  d27c0f7a
- 验证码图片问题 · 1054e1e6
  jiaorz authored Dec 21, 2019
  
  1054e1e6
- 验证码图片问题 · b4ec8563
  jiaorz authored Dec 21, 2019
  
  b4ec8563
- Merge branch 'master-captcha-branch' into dev · 867e57b4
  jiaorz authored Dec 21, 2019
  
  867e57b4
- 验证码图片问题 · f680f0d7
  jiaorz authored Dec 21, 2019
  
  f680f0d7
- 验证码图片问题 · 4c583c52
  jiaorz authored Dec 21, 2019
  
  4c583c52
- Merge remote-tracking branch 'origin/dev' into dev · 93b9c44d
  jiaorz authored Dec 21, 2019
  
  93b9c44d
- Merge branch 'master-captcha-branch' into dev · 7cb58ff6
  jiaorz authored Dec 21, 2019
```
# Conflicts:
#	ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java
```
  7cb58ff6
- Merge branch 'master-zjw' into dev · 678ab118
  周健威 authored Dec 21, 2019
  
  678ab118