# Conflicts:
#	dist/index.html
#	dist/static/css/main.381cb6bca45f1ec9cf708b5100dee1e7.css
#	dist/static/css/main.7c417c0eae1ff92f0366d998858d49ae.css
#	dist/static/css/main.d3a9130a1cedcfdf1a9a02e4f37ca2c5.css
#	dist/static/js/16.0da77f92b8d1ab2e6dff.js
#	dist/static/js/16.3b17d743d502b83d338f.js
#	dist/static/js/16.5f3597b937b6ff3af1a7.js
#	dist/static/js/17.6b3ebc28621b084bd224.js
#	dist/static/js/18.759a98067ceda319dbac.js
#	dist/static/js/19.ffdbfa6a1416f79f5183.js
#	dist/static/js/main.6e48362b5cb668d37572.js

# Conflicts:
#	src/views/card/partials/status-render.js

# Conflicts:
#	src/views/card/partials/status-render.js

* bugfix/卡券包权限bug:
  卡包权限bug修复
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist

# Conflicts:
#	dist/index.html
#	dist/static/css/main.27160a7cf2dfb558bf481ec7d5fce909.css
#	dist/static/css/main.289ef9a92921ef08c9e9bf202ec39a21.css
#	dist/static/css/main.d71c2df8acf2b8c992246ba3b3e4b7b8.css
#	dist/static/js/ecm.09c6c06cb3314d6adea6.js
#	dist/static/js/ecm.763c5b056cf0a48875b2.js
#	dist/static/js/ecm.7d4fb175ac675c5a5d74.js
#	dist/static/js/ewash.1ff85c307f9e68524f34.js
#	dist/static/js/ewash.9359f90f8ce4a9d9d8bf.js
#	dist/static/js/ewash.feb0ffd2cfb795f0d746.js
#	dist/static/js/scan.0ddf1cf110c21976bb32.js
#	dist/static/js/scan.952dd795058a8320af99.js
#	dist/static/js/scan.cc6d123e6bb64892a5b5.js
#	dist/static/js/signIn.84b91fefa20d9462504c.js