店铺管理
Merge branch 'master' of https://github.com/zipn/zipn.git
Merge branch 'master' of https://github.com/zipn/zipn.git

Conflicts:
	src/main/java/cn/bmwm/modules/shop/controller/admin/ShopController.java