From 4a7e309775d7b3bf0f355a66cd5d169d14300fb1 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:15:55 +0800
Subject: [PATCH] 特殊设备添加地址编码

---
 screen-manage/src/main/java/com/moral/api/entity/Sensor.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
index 4f895ba..d83752e 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
@@ -61,7 +61,7 @@
     /**
      * ������������
      */
-    private String defaultUtil;
+    private String defaultUnitKey;
 
     /**
      * ������������
@@ -85,9 +85,15 @@
     private String unitKey;
 
     @TableField(exist = false)
-    private Integer maxValue;
+    private String showUnit;
 
     @TableField(exist = false)
-    private Integer minValue;
+    private String showUnitKey;
+
+    @TableField(exist = false)
+    private String alarmLevel;
+
+    @TableField(exist = false)
+    private String formula;
 
 }

--
Gitblit v1.8.0