From 38b44e0c9996f06524903417f1d0a3f746b4550b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 04 十二月 2023 17:47:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java | 13 +++++++++++--
1 files changed, 11 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 fac6560..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
@@ -7,6 +7,8 @@
@Data
public class BaseCaseVO {
+
+ private Integer baseId;
private String code;
private String name;
private String urlAddress;
@@ -14,9 +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