From 2613aafec8343016a565c5e3e9e6b1ad5e6c6bab Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 09:09:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 4 ++--
1 files changed, 2 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 4840368..6e93009 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,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.setMaxValue(sensor.getMaxValue());
vo.setMinValue(sensor.getMinValue());
- vo.getUnitKey();
+ vo.setUnitKey(sensor.getUnitKey());
return vo;
}
}
--
Gitblit v1.8.0