From e3f745b1839f3c3c8be58efb7b81681f4f2d2e4c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 10:30:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/business/services/http/alarm-config.service.ts |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/app/business/services/http/alarm-config.service.ts b/src/app/business/services/http/alarm-config.service.ts
index 9296a4e..9fd4271 100644
--- a/src/app/business/services/http/alarm-config.service.ts
+++ b/src/app/business/services/http/alarm-config.service.ts
@@ -29,6 +29,7 @@
                 {
                   enable: false,
                   increment: [0,0,0],
+                  degressEnable: false,
                   degression:  [0,0,0]
                 } : alarmLevels[key];
              }

--
Gitblit v1.8.0