From d6ca891b09de6095308a5d948ff4de8b7dde78b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 16 Jun 2021 15:54:28 +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, 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 d1e68fb..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 default_unit_key;
+ 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