Merge branch 'main' into main2

648540858

2023-01-05 6fa5b37b962b05b3aa4b7bf019eb47c4cdbb5738

 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java

@@ -94,9 +94,4 @@
      this.alarm = alarm;
   }

   public void getLocalIp(String deviceLocalIp) {
      if (ObjectUtils.isEmpty(deviceLocalIp)) {

      }
   }
}