Commits · 56ff1becd6e4550915b99c382cfe91dbdabbfd86 · base_platform_enterprise / gic-platform-enterprise · GitLab

24 Apr, 2020 16 commits
- Merge remote-tracking branch 'origin/developer' into developer · 56ff1bec
  guojuxing authored Apr 24, 2020
  
  56ff1bec Browse Files
- 微盟店铺列表查询调整 · 449b793a
  guojuxing authored Apr 24, 2020
  
  449b793a Browse Files
- 修改url · 330ebe8c
  zhiwj authored Apr 24, 2020
  
  330ebe8c Browse Files
- 修改url · 9022af1a
  zhiwj authored Apr 24, 2020
  
  9022af1a Browse Files
- 修改url · 00f8af4e
  zhiwj authored Apr 24, 2020
  
  00f8af4e Browse Files
- Merge branch 'developer' of… · ce84824d
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Apr 24, 2020
  ce84824d Browse Files
- 修改url · ce409a41
  zhiwj authored Apr 24, 2020
  
  ce409a41 Browse Files
- Merge branch 'developer' of… · 079ce215
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 24, 2020
  079ce215 Browse Files
- 通知详情修改 · 3ce9b0d6
  陶光胜 authored Apr 24, 2020
  
  3ce9b0d6 Browse Files
- Merge branch 'developer' of… · 77eeebdd
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Apr 24, 2020
  77eeebdd Browse Files
- bug · 214c55de
  zhiwj authored Apr 24, 2020
  
  214c55de Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 048f9328
  guojuxing authored Apr 24, 2020
  
  048f9328 Browse Files
- 微盟店铺调整 · c3cfa705
  guojuxing authored Apr 24, 2020
  
  c3cfa705 Browse Files
- Merge branch 'developer' of… · 0a57fd90
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Apr 24, 2020
  0a57fd90 Browse Files
- bug · 1fa5216c
  zhiwj authored Apr 24, 2020
  
  1fa5216c Browse Files
- 通知详情修改 · 830f446b
  陶光胜 authored Apr 24, 2020
  
  830f446b Browse Files
23 Apr, 2020 24 commits
- 通知详情修改 · f08238dd
  陶光胜 authored Apr 23, 2020
  
  f08238dd Browse Files
- 通知详情修改 · 208462bb
  陶光胜 authored Apr 23, 2020
  
  208462bb Browse Files
- Merge branch 'developer' of… · 00ba8ce4
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 23, 2020
  00ba8ce4 Browse Files
- 通知详情修改 · 88892599
  陶光胜 authored Apr 23, 2020
  
  88892599 Browse Files
- 会员消费配置调整 · 166e314d
  guojuxing authored Apr 23, 2020
  
  166e314d Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 987c4ad1
  guojuxing authored Apr 23, 2020
  
  987c4ad1 Browse Files
- 海外短信、短信套餐包、国内短信、服务市场统计余额支付数据 · f67cb000
  guojuxing authored Apr 23, 2020
  
  f67cb000 Browse Files
- Merge branch 'developer' of… · 7ab48701
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 23, 2020
  7ab48701 Browse Files
- 通知详情修改 · d89b3587
  陶光胜 authored Apr 23, 2020
  
  d89b3587 Browse Files
- 小程序资源组权限 · a3477758
  zhiwj authored Apr 23, 2020
  
  a3477758 Browse Files
- 小程序资源组权限 · d87a0e0c
  zhiwj authored Apr 23, 2020
  
  d87a0e0c Browse Files
- bug · 9e48c8a7
  zhiwj authored Apr 23, 2020
  
  9e48c8a7 Browse Files
- 通知详情修改 · 18647159
  陶光胜 authored Apr 23, 2020
  
  18647159 Browse Files
- 通知详情修改 · 287c5377
  陶光胜 authored Apr 23, 2020
  
  287c5377 Browse Files
- Merge branch 'developer' of… · 1528884a
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 23, 2020
  1528884a Browse Files
- 通知详情修改 · 6b15ef7f
  陶光胜 authored Apr 23, 2020
  
  6b15ef7f Browse Files
- Merge branch 'developer' of… · a3e8f493
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Apr 23, 2020
  a3e8f493 Browse Files
- 小程序资源组权限 · 415c39d3
  zhiwj authored Apr 23, 2020
  
  415c39d3 Browse Files
- 通知详情修改 · 0201ef70
  陶光胜 authored Apr 23, 2020
  
  0201ef70 Browse Files
- Merge branch 'developer' of… · 400cca1a
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

 Conflicts:
	gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml
```
  陶光胜 authored Apr 23, 2020
  400cca1a Browse Files
- 通知详情修改 · 7433a5c3
  陶光胜 authored Apr 23, 2020
  
  7433a5c3 Browse Files
- 小程序资源组权限 · 1ef70e04
  zhiwj authored Apr 23, 2020
  
  1ef70e04 Browse Files
- 审核 · a32e67f6
  zhiwj authored Apr 23, 2020
  
  a32e67f6 Browse Files
- 小程序资源组权限 · 5ec25f97
  zhiwj authored Apr 23, 2020
  
  5ec25f97 Browse Files