From 375cd035755ca4485893a9524b4ce670ac46732d Mon Sep 17 00:00:00 2001
From: lin <lin@pop-os.localdomain>
Date: 星期一, 06 二月 2023 16:43:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatformCatch.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatformCatch.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatformCatch.java
index 6c429f2..a53d26e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatformCatch.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatformCatch.java
@@ -4,7 +4,9 @@
 
     private String id;
 
-    // 蹇冭烦鏈洖澶嶆鏁�
+    /**
+     * 蹇冭烦鏈洖澶嶆鏁�
+     */
     private int keepAliveReply;
 
     // 娉ㄥ唽鏈洖澶嶆鏁�

--
Gitblit v1.8.0