diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/App.config b/ICSSoft.FromERP/ICSSoft.FromERP/App.config
index 636250b..cc67e58 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP/App.config
+++ b/ICSSoft.FromERP/ICSSoft.FromERP/App.config
@@ -9,7 +9,7 @@
-
+
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
index 247e380..d6913da 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
@@ -11,7 +11,7 @@
var flag = '1';
var mark = '拣料';
var Arguments = '';
- // $.ajaxSettings.async = false;//设置全局同步
+ //$.ajaxSettings.async = false;//设置全局同步
//var PickID = '';
$(function () {