Commits · ddf22833d3e34b1499bf013541b3eb0748ccd780 · marketing-web / marketing

04 Feb, 2021 1 commit
- 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
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 5 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
- update: store-new.2.0.68 · 4c3a1c0a
  chenxin authored Jan 22, 2021
  
  4c3a1c0a Browse Files
21 Jan, 2021 5 commits
- update: vendor · 15e4e83c
  chenxin authored Jan 21, 2021
  
  15e4e83c Browse Files
- update: vendor · e354c25a
  chenxin authored Jan 21, 2021
  
  e354c25a Browse Files
- update: store-card · 364efbb6
  chenxin authored Jan 21, 2021
  
  364efbb6 Browse Files
- fix: build · aaa77dab
  chenxin authored Jan 21, 2021
  
  aaa77dab Browse Files
- update: store-new.2.0.66 · ee91c5f7
  chenxin authored Jan 21, 2021
  
  ee91c5f7 Browse Files
20 Jan, 2021 4 commits
- fix:指定会员下最多选择1000人 · 4621cfcb
  chenxin authored Jan 20, 2021
  
  4621cfcb Browse Files
- fix: build · 56ac57e8
  chenxin authored Jan 20, 2021
  
  56ac57e8 Browse Files
- fix: bug · 1616a45b
  chenxin authored Jan 20, 2021
  
  1616a45b Browse Files
- fix: build 卡券过期根据投放有效期判断 · baba816b
  chenxin authored Jan 20, 2021
  
  baba816b Browse Files
19 Jan, 2021 1 commit
- fix: 一些调整 · 839e0251
  chenxin authored Jan 19, 2021
  
  839e0251 Browse Files