# Conflicts:
#	dist/static/img/dq.afccfc20.png
#	dist/static/img/fs.3060cc10.png
#	dist/static/img/my.8b7d6afc.png
#	dist/static/img/sp.eeab41d3.png
#	src/assets/image/website/clothesImgs.png
#	src/assets/image/website/electricalImgs.png
#	src/assets/image/website/foodImgs.png
#	src/assets/image/website/maternalImgs.png
#	src/assets/image/website/服饰.png
#	src/assets/image/website/母婴.png
#	src/assets/image/website/电器.png
#	src/assets/image/website/食品.png
#	src/views/entry/newyuncang.vue
#	src/views/system/asset/withdraw/index.vue
#	src/views/system/goods/add/components/goodsaftersale.vue
#	src/views/system/goods/add/components/goodsimg.vue
#	src/views/system/goods/add/components/goodsinfomation.vue
#	src/views/system/goods/add/components/goodsparameter.vue
#	src/views/system/goods/add/components/goodsspecifications.vue
#	src/views/system/goods/add/index.vue