Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

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