Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/NewGuideController.cs
	KeWeiOMS.v11.suo
订单信息修改
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/NewGuideController.cs
	KeWeiOMS.Web/Controllers/NewGuideController.cs.orig
	KeWeiOMS.v11.suo
Merge branch 'jmyd2' of github.com:feidu/KeWeiOMS into ttt

Conflicts:
	KeWeiOMS.v11.suo