From 23beb4fde063b4a648c2a273f17cf5c423fa0ae6 Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期一, 01 四月 2024 09:19:46 +0800
Subject: [PATCH] Merge branch 'master' into develop-add-api-key

---
 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