修复合并的bug

648540858

2022-11-29 38a85d432ae9bb861dbcbf090d68fb3dca0d85f6

 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;
   }

}