出、入库管理修改
Merge remote-tracking branch 'KeWeiOMS/jmyd2' into ttt

Conflicts:
	KeWeiOMS.Web/Controllers/DictionaryController.cs
	KeWeiOMS.Web/Controllers/StockInController.cs
	KeWeiOMS.Web/Views/StockOut/Index.cshtml
	KeWeiOMS.v11.suo
提交
出入库类型
Merge remote-tracking branch 'KeWeiOMS/ttt' into ttt

Conflicts:
	KeWeiOMS.Web/Views/StockOut/Index.cshtml
乱码修改
ebay数据
commit
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/DictionaryController.cs.orig
	KeWeiOMS.Web/Scripts/date.js
	KeWeiOMS.Web/Views/Home/Default.cshtml
	KeWeiOMS.Web/Views/StockIn/Index.cshtml
	KeWeiOMS.Web/Views/StockOut/Index.cshtml
	KeWeiOMS.v11.suo