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

mk1990

2022-05-06 a2182b5a7ba0ffbba960e774e019a707b5bf26bb

 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;