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

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -10,6 +10,7 @@
@Data
public class AlarmMode {
    private boolean enable;
    private Long interval;
    private List<AlarmStyle> level1;
    private List<AlarmStyle> level2;
    private List<AlarmStyle> level3;