From 64c7668818aa8272c0aae206a3c0f7007ca38e5d Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期六, 22 七月 2023 16:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/media/domain/RtspSession.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/domain/RtspSession.java b/ard-work/src/main/java/com/ruoyi/media/domain/RtspSession.java
index 26aebbd..8fb136a 100644
--- a/ard-work/src/main/java/com/ruoyi/media/domain/RtspSession.java
+++ b/ard-work/src/main/java/com/ruoyi/media/domain/RtspSession.java
@@ -1,5 +1,6 @@
package com.ruoyi.media.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -13,8 +14,9 @@
*/
@Data
public class RtspSession {
- private String cameraId;
+ private String name;
private String id;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date created;
private String remoteAddr;
private String state;
--
Gitblit v1.9.3