Merge branch 'main' into main2

648540858

2023-01-05 6fa5b37b962b05b3aa4b7bf019eb47c4cdbb5738

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

@@ -382,6 +382,7 @@
      this.geoCoordSys = geoCoordSys;
   }


   public String getTreeType() {
      return treeType;
   }