组合产品设置
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	Document/KeWeiOMS1.pdm
	KeWeiOMS.Web/Scripts/date.js
	KeWeiOMS.Web/Web.config
	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.Web/Scripts/date.js
	KeWeiOMS.Web/Views/Product/Create.cshtml
	KeWeiOMS.v11.suo