From 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 14:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
index 4840368..739896a 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
@@ -87,11 +87,12 @@
private static SensorVO convertToSensorVO(Sensor sensor) {
SensorVO vo = new SensorVO();
vo.setName(sensor.getName());
- vo.setCode(sensor.getCode());
+ vo.setId(sensor.getId());
vo.setUnit(sensor.getUnit());
- vo.setMaxValue(sensor.getMaxValue());
- vo.setMinValue(sensor.getMinValue());
- vo.getUnitKey();
+ vo.setUpper(sensor.getUpper());
+ vo.setLower(sensor.getLower());
+ vo.setUnitKey(sensor.getUnitKey());
+ vo.setCode(sensor.getCode());
return vo;
}
}
--
Gitblit v1.8.0