Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 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;