From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
index 16d4b75..62cf9b9 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
@@ -1,9 +1,14 @@
package com.ycl.vo.casePool;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.time.LocalDateTime;
@Data
public class BaseCaseVO {
+
+ private Integer baseId;
private String code;
private String name;
private String urlAddress;
@@ -11,6 +16,16 @@
private String latitude;
private String picData;
private String grade;
- private String street;
- private String community;
+ private String address;
+ private String algoName;
+ private String alarmName;
+ private String platResourceId;
+ private String videoCode;
+
+ @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime alarmTime;
+
+ @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime currentAlarmTime;
+
}
--
Gitblit v1.8.0