From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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