Commits · 7df396936b22a03067ef6d9173f701c3bd7c4a0c · base_platform_enterprise / gic-data-cloud · GitLab

17 Sep, 2020 6 commits
- Merge branch 'developer' into 'master' · 7df39693
```
门店控件修复

See merge request !71
```
  陶光胜 authored Sep 17, 2020
  7df39693 Browse Files
- 门店控件修复 · 3fa567f6
  陶光胜 authored Sep 17, 2020
  
  3fa567f6 Browse Files
- Merge branch 'developer' into 'master' · c94d215b
```
Developer

See merge request !70
```
  陶光胜 authored Sep 17, 2020
  c94d215b Browse Files
- 门店控件修复 · 7eb792b7
  陶光胜 authored Sep 17, 2020
  
  7eb792b7 Browse Files
- Merge branch 'developer' of… · 1b350bf4
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Sep 17, 2020
  1b350bf4 Browse Files
- 门店控件修复 · 76756f86
  陶光胜 authored Sep 17, 2020
  
  76756f86 Browse Files
16 Sep, 2020 3 commits
- Merge branch 'developer' into 'master' · 88d462d8
```
Developer

See merge request !69
```
  guojx authored Sep 16, 2020
  88d462d8 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 3e671b63
  guojuxing authored Sep 16, 2020
  
  3e671b63 Browse Files
- 权限删除判断：是否有用户在使用中 · 5f1434e2
  guojuxing authored Sep 16, 2020
  
  5f1434e2 Browse Files
14 Sep, 2020 13 commits
- Merge branch 'developer' into 'master' · 7a9a0e50
```
门店控件修复

See merge request !68
```
  陶光胜 authored Sep 14, 2020
  7a9a0e50 Browse Files
- 门店控件修复 · 8cc2702c
  陶光胜 authored Sep 14, 2020
  
  8cc2702c Browse Files
- Merge branch 'developer' into 'master' · a1bdb74d
```
门店控件修复

See merge request !67
```
  陶光胜 authored Sep 14, 2020
  a1bdb74d Browse Files
- 门店控件修复 · 2adcf659
  陶光胜 authored Sep 14, 2020
  
  2adcf659 Browse Files
- Merge branch 'developer' into 'master' · 5b0ace51
```
门店控件修复

See merge request !66
```
  陶光胜 authored Sep 14, 2020
  5b0ace51 Browse Files
- 门店控件修复 · 56b76889
  陶光胜 authored Sep 14, 2020
  
  56b76889 Browse Files
- Merge branch 'developer' into 'master' · 1918b5fb
```
Developer

See merge request !65
```
  陶光胜 authored Sep 14, 2020
  1918b5fb Browse Files
- Merge branch 'developer' of… · 3f5f407d
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Sep 14, 2020
  3f5f407d Browse Files
- 门店控件修复 · 932dbdf5
  陶光胜 authored Sep 14, 2020
  
  932dbdf5 Browse Files
- Merge branch 'developer' into 'master' · fc3f23a9
```
会员分布导购名称修改

See merge request !64
```
  陶光胜 authored Sep 14, 2020
  fc3f23a9 Browse Files
- 会员分布导购名称修改 · c87c1afc
  guojuxing authored Sep 14, 2020
  
  c87c1afc Browse Files
- Merge branch 'developer' into 'master' · 5dc36fb4
```
门店控件修复

See merge request !63
```
  陶光胜 authored Sep 14, 2020
  5dc36fb4 Browse Files
- 门店控件修复 · 2634d658
  陶光胜 authored Sep 14, 2020
  
  2634d658 Browse Files
11 Sep, 2020 2 commits
- Merge branch 'developer' into 'master' · 263807e5
```
重命名

See merge request !62
```
  陶光胜 authored Sep 11, 2020
  263807e5 Browse Files
- 重命名 · acebb22e
  陶光胜 authored Sep 11, 2020
  
  acebb22e Browse Files
10 Sep, 2020 9 commits
- Merge branch 'developer' into 'master' · 7e3ba861
```
无归属查询修改

See merge request !61
```
  陶光胜 authored Sep 10, 2020
  7e3ba861 Browse Files
- 无归属查询修改 · 6a317ca7
  guojuxing authored Sep 10, 2020
  
  6a317ca7 Browse Files
- Merge branch 'developer' into 'master' · 49219468
```
线下第一层合集统计加上无归属

See merge request !60
```
  陶光胜 authored Sep 10, 2020
  49219468 Browse Files
- 线下第一层合集统计加上无归属 · 06d5584d
  guojuxing authored Sep 10, 2020
  
  06d5584d Browse Files
- Merge branch 'developer' into 'master' · 8881c71a
```
会员数据全部设置成线下类型

See merge request !59
```
  陶光胜 authored Sep 10, 2020
  8881c71a Browse Files
- 会员数据全部设置成线下类型 · 5843d399
  guojuxing authored Sep 10, 2020
  
  5843d399 Browse Files
- Merge branch 'developer' into 'master' · 7e7cfbc0
```
Developer

See merge request !58
```
  陶光胜 authored Sep 10, 2020
  7e7cfbc0 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 0cd89c22
  guojuxing authored Sep 10, 2020
  
  0cd89c22 Browse Files
- 区域无归属查询修改 · b375979a
  guojuxing authored Sep 10, 2020
  
  b375979a Browse Files
09 Sep, 2020 7 commits
- Merge branch 'developer' into 'master' · dd18366d
```
重命名

See merge request !57
```
  陶光胜 authored Sep 09, 2020
  dd18366d Browse Files
- 重命名 · b0ae412d
  陶光胜 authored Sep 09, 2020
  
  b0ae412d Browse Files
- Merge branch 'developer' into 'master' · 76d7d66c
```
Developer

See merge request !56
```
  陶光胜 authored Sep 09, 2020
  76d7d66c Browse Files
- Merge branch 'developer' of… · 58c4904e
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Sep 09, 2020
  58c4904e Browse Files
- 重命名 · 609a433e
  陶光胜 authored Sep 09, 2020
  
  609a433e Browse Files
- Merge branch 'developer' into 'master' · 4e376f6b
```
Developer

See merge request !55
```
  zhiwj authored Sep 09, 2020
  4e376f6b Browse Files
- 默认值 · 1b669aa2
  zhiwj authored Sep 09, 2020
  
  1b669aa2 Browse Files