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

Conflicts:
	KeWeiOMS.Web/Controllers/OrderController.cs
	KeWeiOMS.v11.suo
乱码
乱码修改
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/OrderController.cs
	KeWeiOMS.v11.suo