# 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

fix: track

See merge request !135

update: store-new.2.0.68

See merge request !134

# Conflicts:
#	dist/index.html
#	dist/static/css/main.52830b21641ca249ef360f0fb4013492.css
#	dist/static/css/main.7156f6ca97a4dfa400cb75c4c807068d.css
#	dist/static/css/main.94de46aa9b5d2247ed3bc2490df7e3e5.css

fix: build

See merge request !133

fix: 扫码营销文案

See merge request !132

fix: build

See merge request !131

Feature/1.12更新 卡券自动领取

See merge request !130