Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

 src/app/business/services/http/alarm-config.service.ts

@@ -29,6 +29,7 @@
                {
                  enable: false,
                  increment: [0,0,0],
                  degressEnable: false,
                  degression:  [0,0,0]
                } : alarmLevels[key];
             }