From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/resources/system/alarmLevels.json | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 7ca8e65..dd2969e 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -237,6 +237,16 @@
"degressEnable": 0,
"degression": [0,0,0]
},
+ "e28": {
+ "enable": 0,
+ "increment": [
+ 0,
+ 1000,
+ 2000
+ ],
+ "degressEnable": 0,
+ "degression": [0,0,0]
+ },
"e29": {
"enable": 1,
"increment": [
--
Gitblit v1.8.0