-
Master mj ztq See merge request !1158
-
Conflicts: hg-monitor-web-base/src/main/resources/static/src/controller/alarmsubscribeIndex.js hg-monitor-web-base/src/main/resources/static/src/controller/alarmtemplateIndex.js hg-monitor-web-base/src/main/resources/static/src/controller/bustype.js hg-monitor-web-base/src/main/resources/static/src/controller/collectorlist.js hg-monitor-web-base/src/main/resources/static/src/controller/ddicAdd.js
-
fix:监控时间下拉插件样式优化 See merge request !1149