提交人员
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.NhibernateHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KeWeiOMS.Web/Controllers/AttendController.cs
	KeWeiOMS.Web/Controllers/OrderController.cs
	KeWeiOMS.Web/Views/Attend/Index.cshtml
	KeWeiOMS.v11.suo
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/AttendController.cs
	KeWeiOMS.Web/Controllers/OrderController.cs
	KeWeiOMS.Web/Views/Attend/Index.cshtml
	KeWeiOMS.v11.suo
数据库选择备份数据库
123
订单导出格式修改！
Merge remote-tracking branch 'kewei/ttt' into jmyd2

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

Conflicts:
	KeWeiOMS.v11.suo