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

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