Commits · 7c2b6309dce73387e6bb449cc1a9e380ead3d00d · base_platform_enterprise / gic-platform-enterprise · GitLab

08 Aug, 2019 6 commits
- Merge branch 'developer' of… · 7c2b6309
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Aug 08, 2019
  7c2b6309 Browse Files
- 品牌库接口 · 667a966f
  zhiwj authored Aug 08, 2019
  
  667a966f Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 823fc2cc
  guojuxing authored Aug 08, 2019
  
  823fc2cc Browse Files
- 商户初始化配置修改 · 9227463d
  guojuxing authored Aug 08, 2019
  
  9227463d Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · d01bcaba
  zhiwj authored Aug 08, 2019
  
  d01bcaba Browse Files
- 品牌库接口api · 7d622d36
  zhiwj authored Aug 08, 2019
  
  7d622d36 Browse Files
07 Aug, 2019 2 commits
- Merge remote-tracking branch 'origin/developer' into developer · 65bf9322
```
# Conflicts:
#	gic-platform-operation-web/src/main/java/com/gic/operation/web/exception/GlobalExceptionHandler.java
```
  guojuxing authored Aug 07, 2019
  65bf9322 Browse Files
- 商户、用户操作代码优化 · 198e92bf
  guojuxing authored Aug 07, 2019
  
  198e92bf Browse Files
05 Aug, 2019 1 commit
- 品牌库接口api · 50abc93f
  zhiwj authored Aug 05, 2019
  
  50abc93f Browse Files
22 Jul, 2019 1 commit
- 转账审批 · d8a5cf45
  guojuxing authored Jul 22, 2019
  
  d8a5cf45 Browse Files
19 Jul, 2019 1 commit
- 转账审批 · 763dcadb
  guojuxing authored Jul 19, 2019
  
  763dcadb Browse Files
18 Jul, 2019 5 commits
- 商品列表查询 · fb8ac7fa
  guojuxing authored Jul 18, 2019
  
  fb8ac7fa Browse Files
- 商户初始化 · 2245de3d
  guojuxing authored Jul 18, 2019
  
  2245de3d Browse Files
- 商户初始化 · f1cf63a0
  guojuxing authored Jul 18, 2019
  
  f1cf63a0 Browse Files
- 商品列表查询 · 44f5018c
  guojuxing authored Jul 18, 2019
  
  44f5018c Browse Files
- 商户列表查询 · 9ee999fe
  guojuxing authored Jul 18, 2019
  
  9ee999fe Browse Files
17 Jul, 2019 5 commits
- 报名修改 · 0c054990
  guojuxing authored Jul 17, 2019
  
  0c054990 Browse Files
- 报名修改 · fdaa5f8f
  guojuxing authored Jul 17, 2019
  
  fdaa5f8f Browse Files
- 新建商户和超级管理员 · a8435ca6
  guojuxing authored Jul 17, 2019
  
  a8435ca6 Browse Files
- 新建商户和超级管理员 · f833e3ce
  guojuxing authored Jul 17, 2019
  
  f833e3ce Browse Files
- 新建商户和超级管理员 · 3fb0ab48
  guojuxing authored Jul 17, 2019
  
  3fb0ab48 Browse Files
16 Jul, 2019 5 commits
- 新增企业 · 78799d1e
  guojuxing authored Jul 16, 2019
  
  78799d1e Browse Files
- 新增企业 · dfdf31e6
  guojuxing authored Jul 16, 2019
  
  dfdf31e6 Browse Files
- 错误吗调整 · 6ed3903c
  guojuxing authored Jul 16, 2019
  
  6ed3903c Browse Files
- 自定义字段列表添加字段：是否是列表/筛选支持标志 · 45d86452
  guojuxing authored Jul 16, 2019
  
  45d86452 Browse Files
- 企业 · 1b088c64
  guojuxing authored Jul 16, 2019
  
  1b088c64 Browse Files
15 Jul, 2019 3 commits
- init · a58e9123
  陶光胜 authored Jul 15, 2019
  
  a58e9123 Browse Files
- init · 60e67aef
  陶光胜 authored Jul 15, 2019
  
  60e67aef Browse Files
- init · 2d80a4aa
  陶光胜 authored Jul 15, 2019
  
  2d80a4aa Browse Files