From 0d24ea21533d9135c8963a28d8d45bfd207b8ec6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Jul 2021 14:17:22 +0800
Subject: [PATCH] update

---
 screen-manage/src/main/java/com/moral/api/entity/Sensor.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 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 1c37b3a..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
@@ -49,6 +49,21 @@
     private String code;
 
     /**
+     * ������
+     */
+    private Double upper;
+
+    /**
+     * ������
+     */
+    private Double lower;
+
+    /**
+     * ������������
+     */
+    private String defaultUnitKey;
+
+    /**
      * ������������
      */
     private Date createTime;
@@ -63,10 +78,22 @@
      */
     private String isDelete;
 
+    @TableField(exist = false)
+    private String unit;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+    @TableField(exist = false)
+    private String unitKey;
+
+    @TableField(exist = false)
+    private String showUnit;
+
+    @TableField(exist = false)
+    private String showUnitKey;
+
+    @TableField(exist = false)
+    private String alarmLevel;
+
+    @TableField(exist = false)
+    private String formula;
 
 }

--
Gitblit v1.8.0