Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro i...

mk1990

2022-05-23 3c48ef8f4305630663cdc0df0880d3559652edf4

 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;