From 809e4c98c5c801b05ad22116a69728f8d3751abb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 04 一月 2023 10:41:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee.com/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
index f5f772e..fcf2401 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
@@ -66,7 +66,7 @@
private String hookAdminParams;
@JSONField(name = "hook.alive_interval")
- private int hookAliveInterval;
+ private Float hookAliveInterval;
@JSONField(name = "hook.enable")
private String hookEnable;
@@ -798,11 +798,11 @@
this.shellPhell = shellPhell;
}
- public int getHookAliveInterval() {
+ public Float getHookAliveInterval() {
return hookAliveInterval;
}
- public void setHookAliveInterval(int hookAliveInterval) {
+ public void setHookAliveInterval(Float hookAliveInterval) {
this.hookAliveInterval = hookAliveInterval;
}
--
Gitblit v1.8.0