Merge branch 'main' into main2

648540858

2023-02-10 197f80581b63e0ae116bd06243894e744d522d6c

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

@@ -3,6 +3,7 @@

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;

@Component
@ConfigurationProperties(prefix = "sip", ignoreInvalidFields = true)
@@ -92,4 +93,5 @@
   public void setAlarm(boolean alarm) {
      this.alarm = alarm;
   }

}