From 088bc1e162261a91a8779d8079bef9d6a5d6d3e9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 10:06:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/task/MonitorTask.java |    1 +
 1 files changed, 1 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 ff8dc82..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,6 +160,7 @@
         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());

--
Gitblit v1.8.0