运费统计1
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Common/OrderHelper.cs
	KeWeiOMS.Web/Web.config
	KeWeiOMS.v11.suo
多浏览器打印
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/HomeController.cs
	KeWeiOMS.Web/Views/OrderAmount/Index.cshtml
	KeWeiOMS.Web/Web.config
	KeWeiOMS.v11.suo
合并备份文件
打印修改
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/KeWeiOMS.Web.csproj
	KeWeiOMS.v11.suo
运费修正设置
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.v11.suo
Merge remote-tracking branch 'KeWeiOMS/jmyd2' into ttt

Conflicts:
	KeWeiOMS.v11.suo