From df6bc44422110fa911c8666dfb4d97dcabb0328b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 12:24:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index 885339a..f6267aa 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -160,7 +160,9 @@
TMonitor monitor = new TMonitor();
if (monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
monitor.setId(monitorVOMap.get(result.getSerialNumber().getValue()).getId());
+ monitor.setDeviceType(monitorVOMap.get(result.getSerialNumber().getValue()).getDeviceType());
}
+
monitor.setSerialNumber(result.getSerialNumber().getValue());
monitor.setName(result.getName().getValue());
String siteType = result.getJkdwlx().getValue();
--
Gitblit v1.8.0