From e898c344aaa515b4fe16ae7ce3d979160d1e962b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 07 八月 2023 17:28:02 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index 01a11eb..cff0ada 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -66,7 +66,7 @@
      * 璁惧绔彛
      */
     @Schema(description = "璁惧绔彛")
-    private String devicePort;
+    private int devicePort;
 
     /**
      * SIP璁よ瘉鐢ㄦ埛鍚�(榛樿浣跨敤璁惧鍥芥爣缂栧彿)
@@ -183,12 +183,6 @@
     @Schema(description = "鍒涘缓鏃堕棿")
     private String createTime;
 
-    /**
-     * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
-     */
-    @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGrou")
-    private String treeType;
-
     @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
     private boolean asMessageChannel;
 
@@ -264,11 +258,11 @@
         this.deviceIp = deviceIp;
     }
 
-    public String getDevicePort() {
+    public int getDevicePort() {
         return devicePort;
     }
 
-    public void setDevicePort(String devicePort) {
+    public void setDevicePort(int devicePort) {
         this.devicePort = devicePort;
     }
 
@@ -422,14 +416,6 @@
 
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
-    }
-
-    public String getTreeType() {
-        return treeType;
-    }
-
-    public void setTreeType(String treeType) {
-        this.treeType = treeType;
     }
 
     public boolean isAsMessageChannel() {

--
Gitblit v1.8.0