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

648540858

2022-04-15 40a806329ce08d5f50795cf965ef773aa48fdd3e

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

@@ -27,7 +27,7 @@

   Integer keepaliveTimeOut = 255;

   Integer registerTimeInterval = 60;
   Integer registerTimeInterval = 120;

   private boolean alarm = false;