From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Mon, 17 Jun 2019 15:23:45 +0800 Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git --- src/main/java/com/moral/entity/alarm/AlarmMode.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/entity/alarm/AlarmMode.java b/src/main/java/com/moral/entity/alarm/AlarmMode.java index dae319b..41ca5da 100644 --- a/src/main/java/com/moral/entity/alarm/AlarmMode.java +++ b/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; -- Gitblit v1.8.0