From 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 09 十一月 2020 19:38:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 2d79839..52d8089 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf;
+
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@@ -44,6 +45,14 @@
this.sipDomain = sipDomain;
}
+ public String getSipId() {
+ return sipId;
+ }
+
+ public void setSipId(String sipId) {
+ this.sipId = sipId;
+ }
+
public String getSipPassword() {
return sipPassword;
}
@@ -58,13 +67,5 @@
public void setSpeed(Integer speed) {
this.speed = speed;
- }
-
- public String getSipId() {
- return sipId;
- }
-
- public void setSipId(String sipId) {
- this.sipId = sipId;
}
}
--
Gitblit v1.8.0