Merge remote-tracking branch 'origin/master'

沈斌

2017-11-06 1cbd89e5aceb71e990c42b8599e45f2703588878

 src/main/resources/system/alarmLevels.json

@@ -35,9 +35,9 @@
        "level3":40
    },
    "e8":{
        "level1":0,
        "level2":0,
        "level3":0
        "level1":30,
        "level2":40,
        "level3":50
    },
    "e9":{
        "level1":0.01,