update：请求合并

ZhuDongming

2019-11-21 154b73d12f9e39039fc7b099beab3881c94b2d8d

 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": [