采购
Merge branch 'jmyd2' of github.com:feidu/KeWeiOMS into ttt

Conflicts:
	KeWeiOMS.v11.suo
部分修改
部分添加排序、搜索功能
修改
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