From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
index 402f9cf..0802b5c 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
@@ -36,15 +36,25 @@
private Integer versionId;
/**
- * ������code
+ * ������Id
*/
- private String sensorCode;
+ private Integer sensorId;
/**
* ������������key
*/
private String unitKey;
+ /*
+ * ���������
+ * */
+ private Double upper;
+
+ /*
+ * ���������
+ * */
+ private Double lower;
+
/**
* ������������
*/
--
Gitblit v1.8.0