Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

# Conflicts:
#	src/components/huimai/h_edit_brand.vue
#	src/components/huimai/happraise.vue
#	src/components/huimai/hbrand.vue
#	src/components/huimai/hcategory.vue