From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/system/alarmLevels.json |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 91a7ad3..25bfccb 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -12,9 +12,9 @@
         "enable":1
     },
     "e3":{
-        "level1":5000,
-        "level2":8000,
-        "level3":20000
+        "level1":20000,
+        "level2":30000,
+        "level3":40000
     },
     "e4":{
         "level1":30,

--
Gitblit v1.8.0