Commits · 17d0e5f0713123f6cf187764cb1d1e8a6d8e1a2b · base_platform_enterprise / gic-platform-enterprise · GitLab

21 May, 2021 10 commits
- Merge remote-tracking branch 'origin/developer' into developer · 17d0e5f0
  guojuxing authored May 21, 2021
  
  17d0e5f0 Browse Files
- 首页-会员概览-右侧 · 0afaab1b
  guojuxing authored May 21, 2021
  
  0afaab1b Browse Files
- Merge branch 'developer' of… · ea2ea592
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored May 21, 2021
  ea2ea592 Browse Files
- 配置表 · 25a53fcb
  陶光胜 authored May 21, 2021
  
  25a53fcb Browse Files
- 首页-会员概览-左侧趋势图 · 7aebefcf
  guojuxing authored May 21, 2021
  
  7aebefcf Browse Files
- 复制装修页面 · 0dcbba29
  guojuxing authored May 21, 2021
  
  0dcbba29 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · deab0485
  guojuxing authored May 21, 2021
  
  deab0485 Browse Files
- 是否是有人群筛选的页面判断修复 · 4cc44f2e
  guojuxing authored May 21, 2021
  
  4cc44f2e Browse Files
- Merge branch 'developer' of… · 2f707980
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored May 21, 2021
  2f707980 Browse Files
- 配置表 · ba2158ba
  陶光胜 authored May 21, 2021
  
  ba2158ba Browse Files
20 May, 2021 5 commits
- 默认为全部人群类型 · a202ff56
  guojuxing authored May 20, 2021
  
  a202ff56 Browse Files
- 积分服务调整:详情接口VO添加人群字段 · aaf076b2
  guojuxing authored May 20, 2021
  
  aaf076b2 Browse Files
- 积分服务调整：增加序号和人群 · dfedef5f
  guojuxing authored May 20, 2021
  
  dfedef5f Browse Files
- 积分服务调整：增加序号和人群 · c36bea65
  guojuxing authored May 20, 2021
  
  c36bea65 Browse Files
- 积分服务调整：增加序号和人群 · ba0742d1
  guojuxing authored May 20, 2021
  
  ba0742d1 Browse Files
19 May, 2021 5 commits
- 配置表 · 94614e3a
  陶光胜 authored May 19, 2021
  
  94614e3a Browse Files
- Merge branch 'developer' of… · ff9238e9
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored May 19, 2021
  ff9238e9 Browse Files
- 配置表 · 67f42bbf
  陶光胜 authored May 19, 2021
  
  67f42bbf Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · c99cc022
  guojuxing authored May 19, 2021
  
  c99cc022 Browse Files
- 首页-会员概览-左侧趋势图 · 999584f6
  guojuxing authored May 19, 2021
  
  999584f6 Browse Files
18 May, 2021 11 commits
- 配置表 · d8bb0670
  陶光胜 authored May 18, 2021
  
  d8bb0670 Browse Files
- 配置表 · ee9e0bd1
  陶光胜 authored May 18, 2021
  
  ee9e0bd1 Browse Files
- 配置表 · 303f0d78
  陶光胜 authored May 18, 2021
  
  303f0d78 Browse Files
- 配置表 · 58022c43
  陶光胜 authored May 18, 2021
  
  58022c43 Browse Files
- Merge branch 'developer' of… · c3c1541d
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

 Conflicts:
	gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml
```
  陶光胜 authored May 18, 2021
  c3c1541d Browse Files
- 配置表 · 6d3866c6
  陶光胜 authored May 18, 2021
  
  6d3866c6 Browse Files
- 达摩情报销商户黑名单 · cc91c630
  guojuxing authored May 18, 2021
  
  cc91c630 Browse Files
- 达摩情报销商户黑名单 · 6764defc
  guojuxing authored May 18, 2021
  
  6764defc Browse Files
- 达摩产品情报站 · edb4b83e
  guojuxing authored May 18, 2021
  
  edb4b83e Browse Files
- 达摩产品情报站 · 51ded2ca
  guojuxing authored May 18, 2021
  
  51ded2ca Browse Files
- 达摩产品情报站 · 3c420c65
  guojuxing authored May 18, 2021
  
  3c420c65 Browse Files
17 May, 2021 2 commits
- 下载中心，二维码类型归于完整数据类型 · f06c88cf
  guojuxing authored May 17, 2021
  
  f06c88cf Browse Files
- 下载中心，二维码类型归于完整数据类型 · 7a43064f
  guojuxing authored May 17, 2021
  
  7a43064f Browse Files
21 Apr, 2021 2 commits
- Merge remote-tracking branch 'origin/developer' into developer · e1c5fd1c
  guojuxing authored Apr 21, 2021
  
  e1c5fd1c Browse Files
- 页面装修，如果前端没有传组建，则清空 · 734bc9be
  guojuxing authored Apr 21, 2021
  
  734bc9be Browse Files
15 Apr, 2021 2 commits
- Merge branch 'developer' of… · 2901d860
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 15, 2021
  2901d860 Browse Files
- 增加通过微盟店铺id查询 · e6f6d687
  陶光胜 authored Apr 15, 2021
  
  e6f6d687 Browse Files
14 Apr, 2021 1 commit
- 资源组调整：区分自有商户的店铺和共享店铺，分开存放，避免重复授权（共享店铺不能二次共享授权） · 02e80698
  guojuxing authored Apr 14, 2021
  
  02e80698 Browse Files
08 Apr, 2021 2 commits
- LOGGER · 04d4daf2
  yujiejobs authored Apr 08, 2021
  
  04d4daf2 Browse Files
- 短信 · 22e1e2c7
  yujiejobs authored Apr 08, 2021
  
  22e1e2c7 Browse Files