From 3fb93c6ca8bd5487ac900c3434824f421e024986 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 25 Aug 2021 11:57:55 +0800
Subject: [PATCH] screen-common 修复日志工具类BUG
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 2681819..d83752e 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;
@@ -69,9 +84,16 @@
@TableField(exist = false)
private String unitKey;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+ @TableField(exist = false)
+ private String showUnit;
+
+ @TableField(exist = false)
+ private String showUnitKey;
+
+ @TableField(exist = false)
+ private String alarmLevel;
+
+ @TableField(exist = false)
+ private String formula;
}
--
Gitblit v1.8.0