From 35bedb798dc6a84d1dd316ebd882ef1edb9f87f3 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 13 Sep 2021 16:24:30 +0800
Subject: [PATCH] 特殊设备添加guid字段，修改相关接口
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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..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
@@ -61,7 +61,7 @@
/**
* ������������
*/
- private String default_unit_key;
+ private String defaultUnitKey;
/**
* ������������
@@ -85,9 +85,15 @@
private String unitKey;
@TableField(exist = false)
- private Integer maxValue;
+ private String showUnit;
@TableField(exist = false)
- private Integer minValue;
+ private String showUnitKey;
+
+ @TableField(exist = false)
+ private String alarmLevel;
+
+ @TableField(exist = false)
+ private String formula;
}
--
Gitblit v1.8.0