111
重复问题
Merge remote-tracking branch 'KeWeiOMS/jmyd2' into ttt

Conflicts:
	KeWeiOMS.v11.suo
重复修改
设备管理修改
Merge remote-tracking branch 'KeWeiOMS/jmyd2' into ttt

Conflicts:
	KeWeiOMS.Web/Web.config
	KeWeiOMS.v11.suo
采购计划搜索添加
项目管理
Merge remote-tracking branch 'KeWeiOMS/ttt' into ttt

Conflicts:
	KeWeiOMS.v11.suo
提交
添加页面关闭提交
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	Document/KeWeiOMS1.pdm
	KeWeiOMS.Web/Scripts/date.js
	KeWeiOMS.Web/Web.config
	KeWeiOMS.v11.suo