Merge branch 'feature-dgy-后台新功能批量处理' into feature-dgy-后台测试

Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml

@@ -77,7 +77,7 @@
                 shade: [0.5, '#000']
             });
             var userdata = $("#confirmFrm").serialize();
-            var indexs = layer.confirm('确定要设置吗？', function (index) {
+            var indexs = layer.confirm('确定要设置吗？', function (indexs) {
                 $.ajax({
                     type: "POST",
                     url: "/Admin/SysTools/CancelMerAgentDo?r=" + Math.random(1),