From 72360aba85cc4ba1b0caf0823f63d0b81a26ce07 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 06 六月 2022 09:47:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
index e42cfa7..466f6dd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.property;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,6 +28,7 @@
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 位置信息
@@ -62,6 +64,7 @@
* 处理时间
*/
@ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date solveTime;
/**
@@ -87,4 +90,22 @@
*/
@ApiModelProperty("处理图片")
private String solveUrl;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ /**
+ * 接收人
+ */
+ @ApiModelProperty("接收人")
+ private String receiveName;
}
--
Gitblit v1.7.1