Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

 src/main/resources/system/alarmLevels.json

@@ -12,9 +12,9 @@
        "enable":1
    },
    "e3":{
        "level1":5000,
        "level2":8000,
        "level3":20000
        "level1":20000,
        "level2":30000,
        "level3":40000
    },
    "e4":{
        "level1":30,