From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/entity/alarm/AlarmSensorLevel.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/entity/alarm/AlarmSensorLevel.java b/src/main/java/com/moral/entity/alarm/AlarmSensorLevel.java
index 02de3af..0ae05b7 100644
--- a/src/main/java/com/moral/entity/alarm/AlarmSensorLevel.java
+++ b/src/main/java/com/moral/entity/alarm/AlarmSensorLevel.java
@@ -12,7 +12,11 @@
     /*
       ������������������1���������0���������
      */
-    private int enable;
+    private boolean enable;
+    /*
+  ������������������������1���������0���������
+ */
+    private boolean degressEnable;
     /*
   ������������������������ [100,200,300]
    */

--
Gitblit v1.8.0