Authored by 王涛

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