Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

mk1990

2022-06-22 0c4a8c09757ce855fd877fd7b896b5295c4dd26b

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

@@ -27,9 +27,9 @@

   Integer keepaliveTimeOut = 255;

   Integer registerTimeInterval = 60;
   Integer registerTimeInterval = 120;

   private boolean alarm = false;
   private boolean alarm;

   public void setIp(String ip) {
      this.ip = ip;