From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 1bc7352..85d4ae1 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,9 +87,11 @@
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.getUnitKey();
+ vo.setUpper(sensor.getUpper());
+ vo.setLower(sensor.getLower());
+ vo.setUnitKey(sensor.getUnitKey());
return vo;
}
}
--
Gitblit v1.8.0