设备管理修改
项目管理
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