Commits · 0dbc7b0bcf8f030cf3a11079f2829addbf967ae8 · base_platform_enterprise / gic-platform-auth · GitLab

03 Sep, 2019 4 commits
- 角色菜单权限接口 · 0dbc7b0b
  guojuxing authored Sep 03, 2019
  
  0dbc7b0b Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 46e3ee87
  guojuxing authored Sep 03, 2019
  
  46e3ee87 Browse Files
- 角色菜单权限接口 · 8c209735
  guojuxing authored Sep 03, 2019
  
  8c209735 Browse Files
- 添加订单资源 · 9a2573cd
  zhiwj authored Sep 03, 2019
  
  9a2573cd Browse Files
02 Sep, 2019 30 commits
- Merge branch 'developer' of… · 4a5ded94
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

# Conflicts:
#	gic-platform-auth-service/src/main/resources/mapper/TabSysAuthCodeMapper.xml
```
  陶光胜 authored Sep 02, 2019
  4a5ded94 Browse Files
- Merge branch 'developer' of… · f1b6c8b2
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

# Conflicts:
#	gic-platform-auth-service/src/main/resources/mapper/TabSysAuthCodeMapper.xml
```
  陶光胜 authored Sep 02, 2019
  f1b6c8b2 Browse Files
- 联合商户 · 679eb1c7
  陶光胜 authored Sep 02, 2019
  
  679eb1c7 Browse Files
- 用户列表接口 · a674be4b
  guojuxing authored Sep 02, 2019
  
  a674be4b Browse Files
- 用户列表接口 · e2910073
  guojuxing authored Sep 02, 2019
  
  e2910073 Browse Files
- 用户列表接口 · fbd0b3cc
  guojuxing authored Sep 02, 2019
  
  fbd0b3cc Browse Files
- 用户列表接口 · 8bb8dda6
  guojuxing authored Sep 02, 2019
  
  8bb8dda6 Browse Files
- 用户列表接口 · a73ed3ce
  guojuxing authored Sep 02, 2019
  
  a73ed3ce Browse Files
- 新增用户事务代码修改 · 1e5f66e9
  guojuxing authored Sep 02, 2019
  
  1e5f66e9 Browse Files
- 新增用户事务代码修改 · f7e42df6
  guojuxing authored Sep 02, 2019
  
  f7e42df6 Browse Files
- 新增用户添加事务 · dacae27d
  guojuxing authored Sep 02, 2019
  
  dacae27d Browse Files
- 新增用户添加事务 · b69c851c
  guojuxing authored Sep 02, 2019
  
  b69c851c Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 4435c65b
  guojuxing authored Sep 02, 2019
  
  4435c65b Browse Files
- 新增用户添加事务 · f39408f3
  guojuxing authored Sep 02, 2019
  
  f39408f3 Browse Files
- Merge branch 'developer' of… · 3deb0be0
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer
```
  zhiwj authored Sep 02, 2019
  3deb0be0 Browse Files
- 返回id · 262d7cd9
  zhiwj authored Sep 02, 2019
  
  262d7cd9 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 01494451
  guojuxing authored Sep 02, 2019
  
  01494451 Browse Files
- 添加全局异常拦截 · 5147f346
  guojuxing authored Sep 02, 2019
  
  5147f346 Browse Files
- Merge branch 'developer' of… · 82cc05e8
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer
```
  陶光胜 authored Sep 02, 2019
  82cc05e8 Browse Files
- 联合商户 · 0ee7796e
  陶光胜 authored Sep 02, 2019
  
  0ee7796e Browse Files
- 定时任务接口修改，添加参数 · 398e7c73
  guojuxing authored Sep 02, 2019
  
  398e7c73 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e744cda9
  guojuxing authored Sep 02, 2019
  
  e744cda9 Browse Files
- 新增管理员 · 8953e98f
  guojuxing authored Sep 02, 2019
  
  8953e98f Browse Files
- 获取授权码 · 8245ffec
  陶光胜 authored Sep 02, 2019
  
  8245ffec Browse Files
- Merge branch 'developer' of… · 527a4ad5
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer
```
  陶光胜 authored Sep 02, 2019
  527a4ad5 Browse Files
- 获取授权码 · 8f09d428
  陶光胜 authored Sep 02, 2019
  
  8f09d428 Browse Files
- 实体类修正 · 245f766b
  guojuxing authored Sep 02, 2019
  
  245f766b Browse Files
- 实体类修正 · b627d518
  guojuxing authored Sep 02, 2019
  
  b627d518 Browse Files
- 用户角色关联表 · 2bf401e2
  guojuxing authored Sep 02, 2019
  
  2bf401e2 Browse Files
- 用户角色关联表 · 4bca6a30
  guojuxing authored Sep 02, 2019
  
  4bca6a30 Browse Files
30 Aug, 2019 1 commit
- 登陆接口 · 9d9b811e
  陶光胜 authored Aug 30, 2019
  
  9d9b811e Browse Files
29 Aug, 2019 5 commits
- Merge branch 'developer' of… · 131a0920
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

# Conflicts:
#	gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml
```
  陶光胜 authored Aug 29, 2019
  131a0920 Browse Files
- 登陆接口 · f62be843
  陶光胜 authored Aug 29, 2019
  
  f62be843 Browse Files
- 资源组 · 6c456976
  zhiwj authored Aug 29, 2019
  
  6c456976 Browse Files
- 资源组除详情外 · b8c7ae85
  zhiwj authored Aug 29, 2019
  
  b8c7ae85 Browse Files
- Merge branch 'developer' of… · 644ef01b
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer
```
  zhiwj authored Aug 29, 2019
  644ef01b Browse Files