订单数量统计，订单统计
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/UserController.cs
	KeWeiOMS.Web/Views/Logistics/Index.cshtml
	KeWeiOMS.Web/Views/User/Index.cshtml
	KeWeiOMS.v11.suo
search 后面的逗号
1
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Views/Country/Index.cshtml
	KeWeiOMS.Web/Views/EmailReturn/Index.cshtml
	KeWeiOMS.Web/Views/Logistics/Index.cshtml
	KeWeiOMS.Web/Views/OrderPackRecord/Index.cshtml
	KeWeiOMS.Web/Views/OrderPeiRecord/Index.cshtml
	KeWeiOMS.Web/Views/User/Index.cshtml
	KeWeiOMS.v11.suo
订单添加。订单修改！
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.v11.suo
订单验证修改。商品国家销售状态全部修改！
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	Document/KeWeiOMS.pdm
	KeWeiOMS.Web/Controllers/ProductController.cs
	KeWeiOMS.Web/Controllers/PurchasePlanController.cs
	KeWeiOMS.Web/Controllers/UserController.cs
	KeWeiOMS.Web/KeWeiOMS.Web.csproj
	KeWeiOMS.Web/Views/Logistics/Index.cshtml
	KeWeiOMS.v11.suo
备份
1
Merge remote-tracking branch 'KeWeiOMS/jmyd2' into ttt

Conflicts:
	KeWeiOMS.Web/Views/PurchasePlan/Create.cshtml
	KeWeiOMS.v11.suo