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

kaiyu

2020-12-01 65007f6811e580d8660340b8216296e68fae598c

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

@@ -9,7 +9,8 @@
 */
@Data
public class AlarmMode {
    private int enable;
    private boolean enable;
    private Long interval;
    private List<AlarmStyle> level1;
    private List<AlarmStyle> level2;
    private List<AlarmStyle> level3;