Merge branch 'master-v32-xwx' into 'master'

新增或修改告警策略时，未填写通知合并策略也可以保存



See merge request !681

@@ -30,10 +30,10 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             ,range: true
         });
         var resType = localStorage.getItem("currentResType");
-
+        
+        var NoticeMergeFlag = 'off';
         // 获取合并通知开关是否开启
         getNoticeMergeFlag();
-        let NoticeMergeFlag = 'off';
         function getNoticeMergeFlag(){
             admin.req({
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
@@ -196,6 +196,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
 
         //保存策略
         $("#alarmpolicy-form-save-id").on("click",function (){
+            debugger
             var data = form.val("add-alarmpolicy-form");
             //移除非数进性的属性
             delete data['serious-policy-type'];