Commits · 9c04ceaa55dcfc5ce83496e81af14503dbd677c5 · base_platform_enterprise / gic-data-cloud

09 Jul, 2020 11 commits
- 数据字典 · 9c04ceaa
  zhiwj authored Jul 09, 2020
  
  9c04ceaa Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · c72d8505
  zhiwj authored Jul 09, 2020
  
  c72d8505 Browse Files
- 数据字典 · 1dce13ed
  zhiwj authored Jul 09, 2020
  
  1dce13ed Browse Files
- 用户批量转移分组添加全部转移逻辑 · b64c9878
  guojuxing authored Jul 09, 2020
  
  b64c9878 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e8123d70
```
# Conflicts:
#	gic-data-cloud-service/src/main/resources/dubbo-gic-data-cloud-service.xml
```
  guojuxing authored Jul 09, 2020
  e8123d70 Browse Files
- 暂存区 · 0c648ef2
  guojuxing authored Jul 09, 2020
  
  0c648ef2 Browse Files
- 数据字典 · e1eafb2b
  zhiwj authored Jul 09, 2020
  
  e1eafb2b Browse Files
- 数据字典 · 5393ae65
  zhiwj authored Jul 09, 2020
  
  5393ae65 Browse Files
- 用户查询接口 · c919ce49
  guojuxing authored Jul 09, 2020
  
  c919ce49 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 2895b74f
  guojuxing authored Jul 09, 2020
  
  2895b74f Browse Files
- 数据权限集接口 · bd92e5a6
  guojuxing authored Jul 09, 2020
  
  bd92e5a6 Browse Files
08 Jul, 2020 14 commits
- Merge branch 'developer' of… · 3e1bc757
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Jul 08, 2020
  3e1bc757 Browse Files
- 小程序二维码 · 4ff3ce18
  陶光胜 authored Jul 08, 2020
  
  4ff3ce18 Browse Files
- 配置修改 · e0a47e6c
  guojuxing authored Jul 08, 2020
  
  e0a47e6c Browse Files
- 功能下拉接口 · 0fb1952b
  guojuxing authored Jul 08, 2020
  
  0fb1952b Browse Files
- 功能权限集 · 17184e80
  guojuxing authored Jul 08, 2020
  
  17184e80 Browse Files
- 用户详情接口 · 88c2c599
  guojuxing authored Jul 08, 2020
  
  88c2c599 Browse Files
- vo字段调整 · 73e5ba1b
  guojuxing authored Jul 08, 2020
  
  73e5ba1b Browse Files
- 功能模块接口 · 7e8b9a18
  guojuxing authored Jul 08, 2020
  
  7e8b9a18 Browse Files
- 功能下拉接口 · 88879a82
  guojuxing authored Jul 08, 2020
  
  88879a82 Browse Files
- 用户web · 2e28a5f9
  guojuxing authored Jul 08, 2020
  
  2e28a5f9 Browse Files
- 账号分组web · 98694188
  guojuxing authored Jul 08, 2020
  
  98694188 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e6c5fea1
```
# Conflicts:
#	gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysUserMapper.java
#	gic-data-cloud-service/src/main/java/com/gic/cloud/service/UserService.java
#	gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/UserServiceImpl.java
#	gic-data-cloud-service/src/main/resources/mapper/TabSysUserMapper.xml
```
  guojuxing authored Jul 08, 2020
  e6c5fea1 Browse Files
- 功能权限集接口 · f1822143
  guojuxing authored Jul 08, 2020
  
  f1822143 Browse Files
- Merge branch 'master' into 'developer' · 76715c79
```
根据手机号查询用户列表

See merge request !1
```
  陶光胜 authored Jul 08, 2020
  76715c79 Browse Files
07 Jul, 2020 2 commits
- 根据手机号查询用户列表 · 8af52866
  guojuxing authored Jul 07, 2020
  
  8af52866 Browse Files
- 用户列表接口 · 5dfc6a2b
  guojuxing authored Jul 07, 2020
  
  5dfc6a2b Browse Files
06 Jul, 2020 4 commits
- 新增账号分组修改：有效值设置 · 037182f5
  guojuxing authored Jul 06, 2020
  
  037182f5 Browse Files
- Merge branch 'master' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud · 3c40f2f9
  陶光胜 authored Jul 06, 2020
  
  3c40f2f9 Browse Files
- 小程序二维码 · 87e15a36
  陶光胜 authored Jul 06, 2020
  
  87e15a36 Browse Files
- 账号分组接口 · 915e5a48
  guojuxing authored Jul 06, 2020
  
  915e5a48 Browse Files
03 Jul, 2020 1 commit
- init · 64ba4578
  陶光胜 authored Jul 03, 2020
  
  64ba4578 Browse Files