Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

 src/main/resources/system/alarmLevels.json

@@ -72,7 +72,7 @@
      "increment": [
        25,
        30,
        40
        60
      ],
      "degressEnable": 0,
      "degression": [0,0,0]