From a4d06b1354d48d94c8e07d716863bcb7d3876a07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 15:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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