From 9e248232763446e3b0d2b0541ee55e61a9df74b8 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Thu, 17 May 2018 17:21:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/system/alarmLevels.json | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json index 7f7aa3c..4d9dddd 100644 --- a/src/main/resources/system/alarmLevels.json +++ b/src/main/resources/system/alarmLevels.json @@ -72,7 +72,7 @@ "increment": [ 25, 30, - 40 + 60 ], "degressEnable": 0, "degression": [0,0,0] -- Gitblit v1.8.0