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

648540858

2022-04-20 088419b4d8965e37774a217c5a8135e95fc82c5a

 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;