Commits · 12178ad4da2c9f6714b42e6c752fc67f619fbf54 · base_platform_enterprise / gic-platform-auth · GitLab

18 Feb, 2020 2 commits
- Merge remote-tracking branch 'origin/developer' into developer · 12178ad4
  guojuxing authored Feb 18, 2020
  
  12178ad4 Browse Files
- 商户菜单查询修复 · 53f84d1e
  guojuxing authored Feb 18, 2020
  
  53f84d1e Browse Files
17 Feb, 2020 1 commit
- 添加资源获取接口 · 5b329ab0
  zhiwj authored Feb 17, 2020
  
  5b329ab0 Browse Files
16 Feb, 2020 3 commits
- 商户前置资源配置新增的时候校验资源名称 · fe169b1b
  guojuxing authored Feb 16, 2020
  
  fe169b1b Browse Files
- 商户前置资源字典数据接口 · 89094466
  guojuxing authored Feb 16, 2020
  
  89094466 Browse Files
- 商户前置资源调整 · a3667d47
  guojuxing authored Feb 16, 2020
  
  a3667d47 Browse Files
14 Feb, 2020 3 commits
- 商品资源权限控制 · 53a68e13
  guojuxing authored Feb 14, 2020
  
  53a68e13 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · c9c5c3da
  guojuxing authored Feb 14, 2020
  
  c9c5c3da Browse Files
- 商品资源权限控制 · 55f92ef4
  guojuxing authored Feb 14, 2020
  
  55f92ef4 Browse Files
13 Feb, 2020 2 commits
- Merge branch 'developer' of… · 6927647b
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer
```
  zhiwj authored Feb 13, 2020
  6927647b Browse Files
- 添加渠道资源对管理员的判断 · 14a23f89
  zhiwj authored Feb 13, 2020
  
  14a23f89 Browse Files
12 Feb, 2020 5 commits
- Merge remote-tracking branch 'origin/developer' into developer · 02c3708b
  guojuxing authored Feb 12, 2020
  
  02c3708b Browse Files
- 协作人对外新增、查询、删除接口 · 39074881
  guojuxing authored Feb 12, 2020
  
  39074881 Browse Files
- 添加评价人数 · d4317004
  zhiwj authored Feb 12, 2020
  
  d4317004 Browse Files
- 添加评价人数 · 4cb731a1
  zhiwj authored Feb 12, 2020
  
  4cb731a1 Browse Files
- 删除资源组同步好办 · 32425046
  zhiwj authored Feb 12, 2020
  
  32425046 Browse Files
10 Feb, 2020 3 commits
- Merge branch 'developer' of… · de1ee158
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer
```
  zhiwj authored Feb 10, 2020
  de1ee158 Browse Files
- 查询渠道资源 · 946af092
  zhiwj authored Feb 10, 2020
  
  946af092 Browse Files
- 业务前置资源配置 · 5a8d2d28
  guojuxing authored Feb 10, 2020
  
  5a8d2d28 Browse Files
07 Feb, 2020 2 commits
- 添加用户资源 · c4fd436a
  zhiwj authored Feb 07, 2020
  
  c4fd436a Browse Files
- 添加用户资源 · 52fb2641
  zhiwj authored Feb 07, 2020
  
  52fb2641 Browse Files
16 Jan, 2020 1 commit
- 您的GIC商户后台已被停用，请及时联系达摩项目经理！ · 22de121a
  guojuxing authored Jan 16, 2020
  
  22de121a Browse Files
14 Jan, 2020 2 commits
- 渠道资源 · b76f0dff
  zhiwj authored Jan 14, 2020
  
  b76f0dff Browse Files
- 权限菜单查询方式调整：一开始只查询第一层 · 0fbfdbfb
  guojuxing authored Jan 14, 2020
  
  0fbfdbfb Browse Files
09 Jan, 2020 2 commits
- 渠道资源 · afd61885
  zhiwj authored Jan 09, 2020
  
  afd61885 Browse Files
- 登录添加国际区码 · 1c21910d
  guojuxing authored Jan 09, 2020
  
  1c21910d Browse Files
08 Jan, 2020 2 commits
- Merge remote-tracking branch 'origin/developer' into developer · 64e9aebf
  guojuxing authored Jan 08, 2020
  
  64e9aebf Browse Files
- 修改超级管理员，添加发送短信业务逻辑 · 74bd4602
  guojuxing authored Jan 08, 2020
  
  74bd4602 Browse Files
07 Jan, 2020 2 commits
- 添加默认返回 · 5988624d
  zhiwj authored Jan 07, 2020
  
  5988624d Browse Files
- 添加默认返回 · 361a2fb2
  zhiwj authored Jan 07, 2020
  
  361a2fb2 Browse Files
31 Dec, 2019 2 commits
- test · 37012540
  guojuxing authored Dec 31, 2019
  
  37012540 Browse Files
- 获取用户没有权限的操作项接口修改 · 26ffac77
  guojuxing authored Dec 31, 2019
  
  26ffac77 Browse Files
30 Dec, 2019 5 commits
- Merge remote-tracking branch 'origin/developer' into developer · e5c178b0
  guojuxing authored Dec 30, 2019
  
  e5c178b0 Browse Files
- 新建账号分组接口改动，返回账号分组主键ID · 8134af44
  guojuxing authored Dec 30, 2019
  
  8134af44 Browse Files
- 添加商户id · 6348562a
  zhiwj authored Dec 30, 2019
  
  6348562a Browse Files
- 查询所有的组员接口 · 613a97fd
  guojuxing authored Dec 30, 2019
  
  613a97fd Browse Files
- 查询所有的组员接口 · b64e1883
  guojuxing authored Dec 30, 2019
  
  b64e1883 Browse Files
24 Dec, 2019 3 commits
- Merge branch 'revert-9eabf091' into 'developer' · 7f257b8c
```
Revert "udesk"

See merge request !1
```
  陶光胜 authored Dec 24, 2019
  7f257b8c Browse Files
- Revert "udesk" · cd759a8e
```
This reverts commit 9eabf091
```
  陶光胜 authored Dec 24, 2019
  cd759a8e Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 63d1136c
```
# Conflicts:
#	gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
```
  guojuxing authored Dec 24, 2019
  63d1136c Browse Files