Commits · bde56ee4aa1240d9cb489ff468e20b6a73d23b2a · base_platform_enterprise / gic-platform-enterprise · GitLab

13 Aug, 2019 1 commit
- 生成随机数工具类引用 · bde56ee4
  guojuxing authored Aug 13, 2019
  
  bde56ee4 Browse Files
12 Aug, 2019 5 commits
- 修改品牌库 · edb15597
  zhiwj authored Aug 12, 2019
  
  edb15597 Browse Files
- 添加创建时间返回 · 88bc5a91
  zhiwj authored Aug 12, 2019
  
  88bc5a91 Browse Files
- 添加创建时间返回 · 1f25a703
  zhiwj authored Aug 12, 2019
  
  1f25a703 Browse Files
- Merge branch 'developer' of… · 49ce7acf
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Aug 12, 2019
  49ce7acf Browse Files
- 添加创建时间返回 · f8d7c4f3
  zhiwj authored Aug 12, 2019
  
  f8d7c4f3 Browse Files
09 Aug, 2019 18 commits
- 去掉转账审批 · 3b1d9b10
  guojuxing authored Aug 09, 2019
  
  3b1d9b10 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 2cc3fb26
  guojuxing authored Aug 09, 2019
  
  2cc3fb26 Browse Files
- 去掉转账审批 · 2893c47d
  guojuxing authored Aug 09, 2019
  
  2893c47d Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · fe8e8cf5
  zhiwj authored Aug 09, 2019
  
  fe8e8cf5 Browse Files
- 品牌库 · 207ea041
  zhiwj authored Aug 09, 2019
  
  207ea041 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 8f5b26bc
  guojuxing authored Aug 09, 2019
  
  8f5b26bc Browse Files
- 移动随机生成N位数的随机数（字母、数字组成） · e2b52cdc
  guojuxing authored Aug 09, 2019
  
  e2b52cdc Browse Files
- 品牌库 · 171642dc
  zhiwj authored Aug 09, 2019
  
  171642dc Browse Files
- 商户列表添加字段：是否初始化状态字段1：是 0：否 · 3223a155
  guojuxing authored Aug 09, 2019
  
  3223a155 Browse Files
- 商户列表添加字段：是否初始化状态字段1：是 0：否 · ab04fc9f
  guojuxing authored Aug 09, 2019
  
  ab04fc9f Browse Files
- 商户分页查询列表条数不对，修正.排序参数勇敢$接受，而不是用# · e0c0ac03
  guojuxing authored Aug 09, 2019
  
  e0c0ac03 Browse Files
- 商户分页查询列表条数不对，修正 · 200dc7cf
  guojuxing authored Aug 09, 2019
  
  200dc7cf Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 935cd4c1
  guojuxing authored Aug 09, 2019
  
  935cd4c1 Browse Files
- 商户分页查询列表条数不对，修正 · 94702cd2
  guojuxing authored Aug 09, 2019
  
  94702cd2 Browse Files
- Merge branch 'developer' of… · b522b881
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Aug 09, 2019
  b522b881 Browse Files
- 任务调度sdk · 70b5f4f4
  陶光胜 authored Aug 09, 2019
  
  70b5f4f4 Browse Files
- Merge branch 'developer' of… · d1d75eac
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Aug 09, 2019
  d1d75eac Browse Files
- 品牌库接口 · 3e193bb6
  zhiwj authored Aug 09, 2019
  
  3e193bb6 Browse Files
08 Aug, 2019 13 commits
- 新建商户验证公司名称是否重复 · 3a2ed374
  guojuxing authored Aug 08, 2019
  
  3a2ed374 Browse Files
- 新建商户验证公司名称是否重复 · 1ad24899
  guojuxing authored Aug 08, 2019
  
  1ad24899 Browse Files
- Merge branch 'developer' of… · ffc1c9e3
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Aug 08, 2019
  ffc1c9e3 Browse Files
- init · 64bad82e
  陶光胜 authored Aug 08, 2019
  
  64bad82e Browse Files
- 品牌库接口api · 211bc290
  zhiwj authored Aug 08, 2019
  
  211bc290 Browse Files
- 品牌库接口api · 6f19819b
  zhiwj authored Aug 08, 2019
  
  6f19819b Browse Files
- 品牌库接口api · 491bf8f8
  zhiwj authored Aug 08, 2019
  
  491bf8f8 Browse Files
- 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