Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

 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;