# Conflicts:
#	dist/index.html
#	index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/main.12587ce16d65d66288d37ae5458b95b2.css
#	dist/static/css/main.44c7b7a3c9eb3445fbfed62d7ad1a8f0.css
#	dist/static/css/main.8e052e255868d1c4ae8b2198d6478a96.css
#	dist/static/js/evaluation.bb52993eeb503345732a.js
#	dist/static/js/evaluation.d0ca60b9a64850af134d.js
#	dist/static/js/evaluation.faf17b909ac1f2528782.js

fix: 文案错误

See merge request !98

# Conflicts:
#	dist/index.html
#	dist/static/css/main.44c7b7a3c9eb3445fbfed62d7ad1a8f0.css
#	dist/static/css/main.d397428627f7684ee62854a34eff9cd1.css
#	dist/static/css/main.d4748a352168845c5ab23eb726e96f6c.css

Bugfix

See merge request !97

Feature/200917

See merge request !96

Dev

See merge request !95

fix: build wx-text 更换为textarea  涉及ecm和微信群发，要关注历史计划里的展示

See merge request !94

fix: build

See merge request !93

fix: 文本bug；文案

See merge request !92

Dev

See merge request !91

fix: 兑换码的卡券删除状态

See merge request !90

fix: 一些优化

See merge request !89