From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java
index ae9e4e8..8509cf8 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java
@@ -11,7 +11,6 @@
* @Version TODO
**/
@Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class SensorVO {
private Integer id;
@@ -31,8 +30,8 @@
private String unitKey;
- private Integer maxValue;
+ private Double upper;
- private Integer minValue;
+ private Double lower;
}
--
Gitblit v1.8.0