From 19b518e352542ecaf12a6fcc440c834c355a93c7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 10:58:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 9a16d4d..c7bf6a6 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;
/**
* ������������
@@ -84,4 +84,10 @@
@TableField(exist = false)
private String unitKey;
+ @TableField(exist = false)
+ private Integer maxValue;
+
+ @TableField(exist = false)
+ private Integer minValue;
+
}
--
Gitblit v1.8.0