Merge branch 'master' into dev/前端页面修改

2025-04-24 08:43:41 +08:00
parent 900447ae5c 13b7edb271
commit 4dd5864cf1
3 changed files with 6 additions and 10 deletions
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -27,12 +27,12 @@ public class SipConfig {
 	private String id;

 	private String password;
-	
+
 	Integer ptzSpeed = 50;

 	Integer registerTimeInterval = 120;

 	private boolean alarm = false;

-	private long timeout = 500;
+	private long timeout = 1000;
 }