Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java

@@ -173,12 +173,6 @@ public class Device {
 	@Schema(description = "地理坐标系， 目前支持 WGS84,GCJ02")
 	private String geoCoordSys;
 
-	/**
-	 * 树类型 国标规定了两种树的展现方式 行政区划：CivilCode 和业务分组:BusinessGroup
-	 */
-	@Schema(description = "树类型 国标规定了两种树的展现方式 行政区划：CivilCode 和业务分组:BusinessGroup")
-	private String treeType;
-
 	@Schema(description = "密码")
 	private String password;
 
@@ -408,14 +402,6 @@ public class Device {
 		this.geoCoordSys = geoCoordSys;
 	}
 
-	public String getTreeType() {
-		return treeType;
-	}
-
-	public void setTreeType(String treeType) {
-		this.treeType = treeType;
-	}
-
 	public String getPassword() {
 		return password;
 	}

src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java

@@ -183,12 +183,6 @@ public class ParentPlatform {
     @Schema(description = "创建时间")
     private String createTime;
 
-    /**
-     * 树类型 国标规定了两种树的展现方式 行政区划 CivilCode 和业务分组:BusinessGroup
-     */
-    @Schema(description = "树类型 国标规定了两种树的展现方式 行政区划 CivilCode 和业务分组:BusinessGrou")
-    private String treeType;
-
     @Schema(description = "是否作为消息通道")
     private boolean asMessageChannel;
 
@@ -424,14 +418,6 @@ public class ParentPlatform {
         this.createTime = createTime;
     }
 
-    public String getTreeType() {
-        return treeType;
-    }
-
-    public void setTreeType(String treeType) {
-        this.treeType = treeType;
-    }
-
     public boolean isAsMessageChannel() {
         return asMessageChannel;
     }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/TreeType.java

@@ -1,10 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.bean;
-
-/**
- * 目录结构类型
- * @author lin
- */
-public class TreeType {
-    public static final String BUSINESS_GROUP = "BusinessGroup";
-    public static final String CIVIL_CODE = "CivilCode";
-}