From f3419b47ff0b253a9ed1e0dbff4d27fd31876f3f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Jun 2021 10:30:05 +0800
Subject: [PATCH] screen-manage 插入组织型号关系的时候，原始单位默认作为显示单位插入
---
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