Commits · 73f8c9d6f9b88f6b9af0b8f06b9afab43d548e70 · marketing-web / marketing

25 Feb, 2021 1 commit
- Merge branch 'feature/模板消息通知权限' · 73f8c9d6
  caoyanzhi authored Feb 25, 2021
  
  73f8c9d6 Browse Files
24 Feb, 2021 5 commits
- Merge branch 'bugfix' into 'master' · 739185c9
```
update: 回退商品至.20

See merge request !146
```
  chenxin authored Feb 24, 2021
  739185c9 Browse Files
- update: 回退商品至.20 · 18a5d3c0
  chenxin authored Feb 24, 2021
  
  18a5d3c0 Browse Files
- Merge branch 'feature/update-groups-2.25' into 'master' · f2ec4580
```
update: selector.1.2.21

See merge request !145
```
  chenxin authored Feb 24, 2021
  f2ec4580 Browse Files
- Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into… · 7e943aba
```
Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/update-groups-2.25

# Conflicts:
#	dist/index.html
```
  chenxin authored Feb 24, 2021
  7e943aba Browse Files
- Merge branch 'bugfix' into 'master' · 38617ae2
```
Bugfix

See merge request !144
```
  chenxin authored Feb 24, 2021
  38617ae2 Browse Files
23 Feb, 2021 1 commit
- update: e袋洗下载文件 · be3f7682
  chenxin authored Feb 23, 2021
  
  be3f7682 Browse Files
20 Feb, 2021 1 commit
- fix: card 历史数据不校验carddon · f844c9dc
  chenxin authored Feb 20, 2021
  
  f844c9dc Browse Files
19 Feb, 2021 1 commit
- update: selector.1.2.21 · b7be7f7f
  chenxin authored Feb 19, 2021
  
  b7be7f7f Browse Files
04 Feb, 2021 2 commits
- Merge branch 'master' into feature/模板消息通知权限 · a487bf79
  caoyanzhi authored Feb 04, 2021
  
  a487bf79 Browse Files
- Merge branch 'bugfix' into 'master' · ddf22833
```
fix: 去除文案

See merge request !142
```
  chenxin authored Feb 04, 2021
  ddf22833 Browse Files
03 Feb, 2021 1 commit
- fix: 去除文案 · a2d0c9e8
  chenxin authored Feb 03, 2021
  
  a2d0c9e8 Browse Files
02 Feb, 2021 1 commit
- update: 模板消息通知权限 · 7ebd98ee
  caoyanzhi authored Feb 02, 2021
  
  7ebd98ee Browse Files
29 Jan, 2021 2 commits
- Merge branch 'bugfix' into 'master' · 09458121
```
fix: build bug

See merge request !141
```
  chenxin authored Jan 29, 2021
  09458121 Browse Files
- fix: build bug · 4273b686
  chenxin authored Jan 29, 2021
  
  4273b686 Browse Files
28 Jan, 2021 4 commits
- Merge branch 'bugfix' into 'master' · d942591c
```
fix: 转赠图尺寸调整 by ui

See merge request !140
```
  chenxin authored Jan 28, 2021
  d942591c Browse Files
- fix: 转赠图尺寸调整 by ui · 82bc774f
  chenxin authored Jan 28, 2021
  
  82bc774f Browse Files
- Merge branch 'bugfix' into 'master' · 3a92a002
```
fix: bug + 文案

See merge request !139
```
  chenxin authored Jan 28, 2021
  3a92a002 Browse Files
- fix: bug + 文案 · 8bdf9af8
  chenxin authored Jan 28, 2021
  
  8bdf9af8 Browse Files
27 Jan, 2021 6 commits
- Merge branch 'release' into 'master' · 61204214
```
fix: 文案调整

See merge request !138
```
  chenxin authored Jan 27, 2021
  61204214 Browse Files
- fix: 文案调整 · 8acdd4fd
  chenxin authored Jan 27, 2021
  
  8acdd4fd Browse Files
- Merge branch 'release' into 'master' · 9388186f
```
Release

See merge request !137
```
  chenxin authored Jan 27, 2021
  9388186f Browse Files
- fix: 文案调整 · c5eeb5b0
  chenxin authored Jan 27, 2021
  
  c5eeb5b0 Browse Files
- fix: 转赠增加默认图片 · 2c0ff0df
  chenxin authored Jan 27, 2021
  
  2c0ff0df Browse Files
- fix: bug · dcf75b5e
  chenxin authored Jan 27, 2021
  
  dcf75b5e Browse Files
26 Jan, 2021 10 commits
- fix: build · 425a4df3
  chenxin authored Jan 26, 2021
  
  425a4df3 Browse Files
- fix: balabala + member-group.28 · c2f9f784
  chenxin authored Jan 26, 2021
  
  c2f9f784 Browse Files
- update: vendor · 1fc4f22e
  chenxin authored Jan 26, 2021
  
  1fc4f22e Browse Files
- Merge branch 'release' into 'master' · 992dd6ed
```
Release

See merge request !136
```
  chenxin authored Jan 26, 2021
  992dd6ed Browse Files
- fix: build · 4f227231
  chenxin authored Jan 26, 2021
  
  4f227231 Browse Files
- fix: merge member-group · 5e01b446
  chenxin authored Jan 26, 2021
  
  5e01b446 Browse Files
- Merge branch 'feature/不良评价分配' into release · 1ca3e4fa
```
# Conflicts:
#	dist/index.html
#	dist/static/css/main.16bfce300d8d693714ca89af6416b26a.css
#	dist/static/css/main.7156f6ca97a4dfa400cb75c4c807068d.css
#	dist/static/css/main.d96dfc6117cd0589652426772559436b.css
#	dist/static/js/manifest.5c3a850af62f233d1d6e.js
#	index.html
```
  chenxin authored Jan 26, 2021
  1ca3e4fa Browse Files
- update: vendor · effa87bd
  chenxin authored Jan 26, 2021
  
  effa87bd Browse Files
- fix: update vendor · 131b4311
  chenxin authored Jan 26, 2021
  
  131b4311 Browse Files
- fix: update vendor · 8f822818
  chenxin authored Jan 26, 2021
  
  8f822818 Browse Files
25 Jan, 2021 1 commit
- fix: update vendor · 8d843296
  chenxin authored Jan 25, 2021
  
  8d843296 Browse Files
22 Jan, 2021 4 commits
- Merge branch 'bugfix2' into 'master' · 30367ab4
```
fix: track

See merge request !135
```
  chenxin authored Jan 22, 2021
  30367ab4 Browse Files
- fix: track · 789f97dc
  chenxin authored Jan 22, 2021
  
  789f97dc Browse Files
- fix: bug 修复 · f17a13b5
  chenxin authored Jan 22, 2021
  
  f17a13b5 Browse Files
- Merge branch 'feature/update-store-new.2.0.68' into 'master' · fa29c7bf
```
update: store-new.2.0.68

See merge request !134
```
  chenxin authored Jan 22, 2021
  fa29c7bf Browse Files