提交
Merge remote-tracking branch 'KeWeiOMS/jmyd2' into ttt
商品订单修改
商品是否侵权修改
修改
提交
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/ProductController.cs
	KeWeiOMS.Web/Controllers/StockInController.cs
	KeWeiOMS.Web/KeWeiOMS.Web.csproj
	KeWeiOMS.Web/Views/Order/Edit.cshtml
	KeWeiOMS.Web/Views/Product/Create.cshtml
	KeWeiOMS.Web/Views/Product/Edit.cshtml
	KeWeiOMS.Web/Web.config
	KeWeiOMS.v11.suo