From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' 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