From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/alarm/AlarmMode.java | 2 +-
1 files changed, 1 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..b3d3f76 100644
--- a/src/main/java/com/moral/entity/alarm/AlarmMode.java
+++ b/src/main/java/com/moral/entity/alarm/AlarmMode.java
@@ -9,7 +9,7 @@
*/
@Data
public class AlarmMode {
- private int enable;
+ private boolean enable;
private List<AlarmStyle> level1;
private List<AlarmStyle> level2;
private List<AlarmStyle> level3;
--
Gitblit v1.8.0