From 43e5052b91f0568ccbcf3fd6df70cf8209db184a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 28 May 2021 17:36:11 +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, 1 insertions(+), 7 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..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
@@ -61,7 +61,7 @@
/**
* ������������
*/
- private String defaultUtil;
+ private String defaultUnitKey;
/**
* ������������
@@ -83,11 +83,5 @@
@TableField(exist = false)
private String unitKey;
-
- @TableField(exist = false)
- private Integer maxValue;
-
- @TableField(exist = false)
- private Integer minValue;
}
--
Gitblit v1.8.0