From 4ad67c20b9c5e6625babefeee59ccee155cfc3aa Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 16:54:10 +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/unitConversion/UnitConversionQueryVO.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
index 41d7a4f..3057cb7 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
@@ -31,6 +31,7 @@
private long size;
+
private List<UnitConversionVO> unitConversions;
public static UnitConversionQueryVO convert(UnitConversionQueryDTO dto) {
@@ -64,6 +65,7 @@
vo.setOriginalUnitName(originalUnit.getDataValue());
vo.setTargetUnitName(targetUnit.getDataValue());
vo.setFormula(unitConversion.getFormula());
+ vo.setSensorCode(unitConversion.getSensorCode());
return vo;
}
--
Gitblit v1.8.0