From 8c4922cbe14b126c5c04a23b0c1968676e597eb7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 08 四月 2023 15:29:15 +0800
Subject: [PATCH] Merge branch '2.6.7' into wvp-28181-2.0

---
 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
index dda2976..b73d74c 100644
--- 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