Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

 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;