From e77cdf62567ba92d2d3131da20429dcbfc3b7ea2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 31 Aug 2023 16:11:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 5 +++--
1 files changed, 3 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 6e93009..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
@@ -89,9 +89,10 @@
vo.setName(sensor.getName());
vo.setId(sensor.getId());
vo.setUnit(sensor.getUnit());
- vo.setMaxValue(sensor.getMaxValue());
- vo.setMinValue(sensor.getMinValue());
+ vo.setUpper(sensor.getUpper());
+ vo.setLower(sensor.getLower());
vo.setUnitKey(sensor.getUnitKey());
+ vo.setCode(sensor.getCode());
return vo;
}
}
--
Gitblit v1.8.0