From aecc6316d0a6bcb3119dc062106deb5a57cdd790 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 25 May 2021 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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