From 4c439e299c0dc87842d5daa5ffdc72034ee6ae9f Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 18 Dec 2024 09:55:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml | 1 +
 .../java/com/njcn/gather/device/device/pojo/vo/PreDetection.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml b/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml
index a142f083..67110677 100644
--- a/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml
+++ b/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml
@@ -23,6 +23,7 @@
             d.IP,
             ( select name from sys_dict_data sd where d.Dev_Type= sd.id) as Dev_Type,
             d.Port,
+            d.Dev_Chns as devChns,
             d.Series,
             d.Dev_Key
         FROM
diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java
index e58aa8d2..b6cbcf6d 100644
--- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java
+++ b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java
@@ -53,6 +53,7 @@ public class PreDetection {
     @JsonProperty("devKey")
     private String devKey;
 
+    private Integer devChns;
     /**
      * 监测点信息
      */