Commits · master · base_platform_enterprise / gic-data-cloud · GitLab

26 Nov, 2020 1 commit
- Merge branch 'developer' into 'master' · 52fe7e54
```
Developer

See merge request !77
```
  陶光胜 authored Nov 26, 2020
  52fe7e54 Browse Files
23 Nov, 2020 2 commits
- 好办关联 · a76bc52c
  zhiwj authored Nov 23, 2020
  
  a76bc52c Browse Files
- 好办关联 · c427a178
  zhiwj authored Nov 23, 2020
  
  c427a178 Browse Files
17 Nov, 2020 1 commit
- 去掉重复值 · 7e00a9ec
  zhiwj authored Nov 17, 2020
  
  7e00a9ec Browse Files
15 Oct, 2020 2 commits
- status改成delete_flag · 3136fd89
  guojuxing authored Oct 15, 2020
  
  3136fd89 Browse Files
- status改成delete_flag · 8f1242e7
  guojuxing authored Oct 15, 2020
  
  8f1242e7 Browse Files
18 Sep, 2020 18 commits
- Merge branch 'developer' into 'master' · e89e0f9e
```
Developer

See merge request !76
```
  陶光胜 authored Sep 18, 2020
  e89e0f9e Browse Files
- Merge branch 'developer' of… · de0e632d
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Sep 18, 2020
  de0e632d Browse Files
- 门店控件修复 · 1e50dcf3
  陶光胜 authored Sep 18, 2020
  
  1e50dcf3 Browse Files
- Merge branch 'developer' into 'master' · daa6292f
```
去掉重复值

See merge request !75
```
  zhiwj authored Sep 18, 2020
  daa6292f Browse Files
- 去掉重复值 · e415a7fa
  zhiwj authored Sep 18, 2020
  
  e415a7fa Browse Files
- Merge branch 'developer' into 'master' · ec6f3c40
```
Developer

See merge request !74
```
  zhiwj authored Sep 18, 2020
  ec6f3c40 Browse Files
- 去掉重复值 · 1d7cc64d
  zhiwj authored Sep 18, 2020
  
  1d7cc64d Browse Files
- Merge branch 'developer' of… · afcc744f
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  zhiwj authored Sep 18, 2020
  afcc744f Browse Files
- 去掉重复值 · 4aa7ecb4
  zhiwj authored Sep 18, 2020
  
  4aa7ecb4 Browse Files
- Merge branch 'developer' into 'master' · db15d0b3
```
Developer

See merge request !73
```
  guojx authored Sep 18, 2020
  db15d0b3 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 9f0c3ad1
  guojuxing authored Sep 18, 2020
  
  9f0c3ad1 Browse Files
- 自定义画像同步删除 · eaf0cb99
  guojuxing authored Sep 18, 2020
  
  eaf0cb99 Browse Files
- Merge branch 'developer' into 'master' · 0a3a7221
```
Developer

See merge request !72
```
  陶光胜 authored Sep 18, 2020
  0a3a7221 Browse Files
- 门店控件修复 · 63846dbd
  陶光胜 authored Sep 18, 2020
  
  63846dbd Browse Files
- 门店控件修复 · 49024381
  陶光胜 authored Sep 18, 2020
  
  49024381 Browse Files
- 门店控件修复 · 7264701f
  陶光胜 authored Sep 18, 2020
  
  7264701f Browse Files
- Merge branch 'developer' of… · ed030a62
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Sep 18, 2020
  ed030a62 Browse Files
- 门店控件修复 · fe5a804a
  陶光胜 authored Sep 18, 2020
  
  fe5a804a Browse Files
17 Sep, 2020 8 commits
- 去掉重复值 · c4c319d6
  zhiwj authored Sep 17, 2020
  
  c4c319d6 Browse Files
- 去掉重复值 · 08b68303
  zhiwj authored Sep 17, 2020
  
  08b68303 Browse Files
- 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 5 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