Merge branch 'master-V32-XuHaoJie' into 'master'

通用-公参数-添加合并通知为13



See merge request !11

@@ -385,6 +385,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
             var typeName = new Map();
             typeName.set("10","告警通知");
             typeName.set("11","告警消除");
+            //2021-10-15 添加合并通知 XuHaoJie
+            typeName.set("13","合并通知");
             typeName.set("20","巡检报表通知");
             typeName.set("30","系统通知");
             typeName.set("99","测试通知");