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

27 Aug, 2020 6 commits
- Merge branch 'developer' into 'master' · d4127ef0
```
查询设置无归属

See merge request !31
```
  陶光胜 authored Aug 27, 2020
  d4127ef0 Browse Files
- 查询设置无归属 · 082bf723
  guojuxing authored Aug 27, 2020
  
  082bf723 Browse Files
- Merge branch 'developer' into 'master' · 0ee9f913
```
Developer

See merge request !30
```
  陶光胜 authored Aug 27, 2020
  0ee9f913 Browse Files
- 查询设置无归属 · d1544fc3
  guojuxing authored Aug 27, 2020
  
  d1544fc3 Browse Files
- Merge branch 'developer' of… · f06d03c4
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Aug 27, 2020
  f06d03c4 Browse Files
- 观云台小程序 · 0f520ea2
  陶光胜 authored Aug 27, 2020
  
  0f520ea2 Browse Files
26 Aug, 2020 10 commits
- Merge branch 'developer' into 'master' · 4a766a08
```
添加会员卡权限

See merge request !29
```
  陶光胜 authored Aug 26, 2020
  4a766a08 Browse Files
- 添加会员卡权限 · dfba9625
  guojuxing authored Aug 26, 2020
  
  dfba9625 Browse Files
- Merge branch 'developer' into 'master' · f91eb4a1
```
添加会员卡的数据

See merge request !28
```
  陶光胜 authored Aug 26, 2020
  f91eb4a1 Browse Files
- 添加会员卡的数据 · d7c32edc
  guojuxing authored Aug 26, 2020
  
  d7c32edc Browse Files
- Merge branch 'developer' into 'master' · 48528271
```
Developer

See merge request !27
```
  陶光胜 authored Aug 26, 2020
  48528271 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 7fdd1964
  guojuxing authored Aug 26, 2020
  
  7fdd1964 Browse Files
- 数据调整 · 987764c5
  guojuxing authored Aug 26, 2020
  
  987764c5 Browse Files
- Merge branch 'developer' into 'master' · 5e19a8ed
```
Developer

See merge request !26
```
  陶光胜 authored Aug 26, 2020
  5e19a8ed Browse Files
- Merge branch 'developer' of… · 6e83d7c0
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer
```
  陶光胜 authored Aug 26, 2020
  6e83d7c0 Browse Files
- 观云台小程序 · 9b1ef1ab
  陶光胜 authored Aug 26, 2020
  
  9b1ef1ab Browse Files
25 Aug, 2020 18 commits
- Merge branch 'developer' into 'master' · 3a9df88c
```
Developer

See merge request !25
```
  陶光胜 authored Aug 25, 2020
  3a9df88c Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · bd43c145
  guojuxing authored Aug 25, 2020
  
  bd43c145 Browse Files
- 区域调整：如果错误，抛出错误 · f1791f5b
  guojuxing authored Aug 25, 2020
  
  f1791f5b Browse Files
- Merge branch 'developer' into 'master' · e55eebff
```
Developer

See merge request !24
```
  陶光胜 authored Aug 25, 2020
  e55eebff Browse Files
- 观云台小程序 · 24ffba9d
  陶光胜 authored Aug 25, 2020
  
  24ffba9d Browse Files
- 观云台小程序 · e1c88db5
  陶光胜 authored Aug 25, 2020
  
  e1c88db5 Browse Files
- Merge branch 'developer' into 'master' · dd641759
```
观云台小程序

See merge request !23
```
  陶光胜 authored Aug 25, 2020
  dd641759 Browse Files
- 观云台小程序 · de2c29ab
  陶光胜 authored Aug 25, 2020
  
  de2c29ab Browse Files
- Merge branch 'developer' into 'master' · b2f0581d
```
观云台小程序

See merge request !22
```
  陶光胜 authored Aug 25, 2020
  b2f0581d Browse Files
- 观云台小程序 · 16ab7921
  陶光胜 authored Aug 25, 2020
  
  16ab7921 Browse Files
- Merge branch 'developer' into 'master' · d6e901d7
```
观云台小程序

See merge request !21
```
  陶光胜 authored Aug 25, 2020
  d6e901d7 Browse Files
- 观云台小程序 · 9b8fc061
  陶光胜 authored Aug 25, 2020
  
  9b8fc061 Browse Files
- Merge branch 'developer' into 'master' · c9014764
```
观云台小程序

See merge request !20
```
  陶光胜 authored Aug 25, 2020
  c9014764 Browse Files
- 观云台小程序 · d1c0eac3
  陶光胜 authored Aug 25, 2020
  
  d1c0eac3 Browse Files
- Merge branch 'developer' into 'master' · 279859f6
```
观云台小程序

See merge request !19
```
  陶光胜 authored Aug 25, 2020
  279859f6 Browse Files
- 观云台小程序 · 0db06a43
  陶光胜 authored Aug 25, 2020
  
  0db06a43 Browse Files
- Merge branch 'developer' into 'master' · e8cf3030
```
观云台小程序

See merge request !18
```
  陶光胜 authored Aug 25, 2020
  e8cf3030 Browse Files
- 观云台小程序 · 5cb26ad4
  陶光胜 authored Aug 25, 2020
  
  5cb26ad4 Browse Files
21 Aug, 2020 6 commits
- Merge branch 'developer' into 'master' · ebead912
```
观云台小程序

See merge request !17
```
  陶光胜 authored Aug 21, 2020
  ebead912 Browse Files
- 观云台小程序 · ee0a75ab
  陶光胜 authored Aug 21, 2020
  
  ee0a75ab Browse Files
- Merge branch 'developer' into 'master' · 4320f94f
```
观云台小程序

See merge request !16
```
  陶光胜 authored Aug 21, 2020
  4320f94f Browse Files
- 观云台小程序 · 2ec95c0b
  陶光胜 authored Aug 21, 2020
  
  2ec95c0b Browse Files
- Merge branch 'developer' into 'master' · dd67eeff
```
观云台小程序

See merge request !15
```
  陶光胜 authored Aug 21, 2020
  dd67eeff Browse Files
- 观云台小程序 · 57477b74
  陶光胜 authored Aug 21, 2020
  
  57477b74 Browse Files