Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 src/main/java/com/moral/entity/alarm/AlarmSensorLevel.java

@@ -14,6 +14,10 @@
     */
    private boolean enable;
    /*
  是否启用反向三级1启用，0不启用
 */
    private boolean degressEnable;
    /*
  递增阀值，例如： [100,200,300]
   */
    private List<Float> increment;