From 1dcdbc3742835ccab28a8983ae002d2bbdba87eb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 02 三月 2022 12:52:37 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record

---
 src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeviceChannelTree.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeviceChannelTree.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeviceChannelTree.java
index b147a9e..4eaf598 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeviceChannelTree.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/DeviceChannelTree.java
@@ -19,7 +19,7 @@
     /**
      * 涓婚敭ID
      */
-    private String id;
+    private int id;
 
     /**
      * 鐖惰妭鐐笽D
@@ -27,6 +27,12 @@
     private String parentId;
 
     private String parentName;
+
+    private String title;
+
+    private String key;
+
+    private String value;
 
     /**
      * 瀛愬瓩鑺傜偣
@@ -47,4 +53,13 @@
         }
         return this.children;
     }
+
+    @Override
+    public Boolean getHasChildren() {
+        if (children.size() > 0) {
+            return true;
+        } else {
+            return this.hasChildren;
+        }
+    }
 }

--
Gitblit v1.8.0