Merge branch 'master-500-dev-xwx' into 'master-500-dev'

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



See merge request !683

@@ -30,10 +30,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             ,range: true
         });
         var resType = localStorage.getItem("currentResType");
-
+        var NoticeMergeFlag = 'off';
         // 获取合并通知开关是否开启
         getNoticeMergeFlag();
-        var NoticeMergeFlag = 'off';
         function getNoticeMergeFlag(){
             admin.req({
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'