From f6320c7dd3dfd25e98bb63f41d79a33af5009a93 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:02:16 +0800
Subject: [PATCH] 合并主线

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java
index de68e30..01ac5c4 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItemLite.java
@@ -38,8 +38,6 @@
 
     private String secret;
 
-    private int streamNoneReaderDelayMS;
-
     private int hookAliveInterval;
 
     private int recordAssistPort;
@@ -60,9 +58,7 @@
         this.rtspPort = mediaServerItem.getRtspPort();
         this.rtspSSLPort = mediaServerItem.getRtspSSLPort();
         this.secret = mediaServerItem.getSecret();
-        this.streamNoneReaderDelayMS = mediaServerItem.getStreamNoneReaderDelayMS();
         this.hookAliveInterval = mediaServerItem.getHookAliveInterval();
-        this.streamNoneReaderDelayMS = mediaServerItem.getStreamNoneReaderDelayMS();
         this.recordAssistPort = mediaServerItem.getRecordAssistPort();
     }
 
@@ -169,14 +165,6 @@
 
     public void setSecret(String secret) {
         this.secret = secret;
-    }
-
-    public int getStreamNoneReaderDelayMS() {
-        return streamNoneReaderDelayMS;
-    }
-
-    public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) {
-        this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
     }
 
     public int getHookAliveInterval() {

--
Gitblit v1.8.0