发送
Merge branch 'master' of https://github.com/Bobom/kuanmai

Conflicts:
	kmjxc/bl/Open/TaoBao/TaobaoProductManager.cs
	kmjxc/web/Controllers/api/ShopController.cs
	kmjxc/web/Scripts/kmjxc.js
	kmjxc/web/Views/Shop/Product.cshtml