From 562dbb0857e4e6f7a250d69752270c0c165d5141 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 二月 2024 20:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main-dev' into main-dev
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForStreamChange.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForStreamChange.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForStreamChange.java
old mode 100644
new mode 100755
index dda2976..b73d74c
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForStreamChange.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForStreamChange.java
@@ -15,6 +15,7 @@
private JSONObject content;
+ @JSONField(format="yyyy-MM-dd HH:mm:ss")
private Instant expires;
@Override
--
Gitblit v1.8.0