删除修改。刷新修改
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Controllers/CountryController.cs
	KeWeiOMS.Web/Controllers/DictionaryController.cs
	KeWeiOMS.Web/Scripts/date.js
	KeWeiOMS.Web/Views/Account/Index.cshtml
	KeWeiOMS.Web/Views/AccountEmail/Index.cshtml
	KeWeiOMS.Web/Views/Country/Index.cshtml
	KeWeiOMS.Web/Views/Currency/Index.cshtml
	KeWeiOMS.Web/Views/Dictionary/Index.cshtml
	KeWeiOMS.Web/Views/DictionaryClass/Index.cshtml
	KeWeiOMS.Web/Views/Email/Index.cshtml
	KeWeiOMS.Web/Views/EmailTemplate/Index.cshtml
	KeWeiOMS.Web/Views/Machine/Index.cshtml
	KeWeiOMS.Web/Views/Order/Index.cshtml
	KeWeiOMS.Web/Views/Order/ScanExport.cshtml
	KeWeiOMS.Web/Views/OrderAddress/Index.cshtml
	KeWeiOMS.Web/Views/OrderProduct/Index.cshtml
	KeWeiOMS.Web/Views/OrderRecord/Index.cshtml
	KeWeiOMS.Web/Views/Organize/Index.cshtml
	KeWeiOMS.Web/Views/PaypalAccount/Index.cshtml
	KeWeiOMS.Web/Views/Permission/Index.cshtml
	KeWeiOMS.Web/Views/PermissionItem/Index.cshtml
	KeWeiOMS.Web/Views/PermissionScope/Index.cshtml
	KeWeiOMS.Web/Views/Placard/Index.cshtml
	KeWeiOMS.Web/Views/PrintTemplate/Index.cshtml
	KeWeiOMS.Web/Views/ProductSKU/Index.cshtml
	KeWeiOMS.Web/Views/Project/Create.cshtml
	KeWeiOMS.Web/Views/Project/Index.cshtml
	KeWeiOMS.Web/Views/PurchasePlan/Index.cshtml
	KeWeiOMS.Web/Views/ReturnAddress/Index.cshtml
	KeWeiOMS.Web/Views/Role/Index.cshtml
	KeWeiOMS.Web/Views/SerialNumber/Index.cshtml
	KeWeiOMS.Web/Views/StockIn/Index.cshtml
	KeWeiOMS.Web/Views/StockOut/Index.cshtml
	KeWeiOMS.Web/Views/Supplier/Index.cshtml
	KeWeiOMS.Web/Views/SuppliersProduct/Index.cshtml
	KeWeiOMS.Web/Views/UserRole/Index.cshtml
	KeWeiOMS.Web/Views/Warehouse/Index.cshtml
	KeWeiOMS.v11.suo
出、入库管理修改
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