From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java
index 2be2c89..894f5c2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java
@@ -34,6 +34,8 @@
      */
     //娴佹挱鏀惧崗璁紝1-ezopen銆�2-hls銆�3-rtmp銆�4-flv锛岄粯璁や负1
     private int protocol;
+    //杩囨湡鏃堕暱锛屽崟浣嶇锛涢拡瀵筯ls/rtmp璁剧疆鏈夋晥鏈燂紝鐩稿鏃堕棿锛�30绉�-720澶�
+    private int expireTime;
     /**
      * 缁撴潫钀ょ煶浜戞憚鍍忓ご鎾斁鍦板潃鐩稿叧鍙傛暟
      */

--
Gitblit v1.9.3