From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 649bfea..7d9b70f 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;
--
Gitblit v1.8.0