Merge branch 'main' into main-dev

648540858

2023-04-03 786c76ba714321c2d481b32afbb619a33f7c11a9

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

@@ -188,7 +188,6 @@
   @Schema(description = "SIP交互IP（设备访问平台的IP）")
   private String localIp;


   public String getDeviceId() {
      return deviceId;
   }