From c62d25bf9cf51d7421035abd6489945e77db1f04 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 04 六月 2021 18:29:18 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into 'test'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
index 7f4cc56..991a1ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
@@ -86,9 +86,12 @@
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date happenTime;
 
-    @ApiModelProperty(value = "发生地点")
+    @ApiModelProperty(value = "事件发生地点备注")
 	private String happentAddress;
 
+	@ApiModelProperty(value = "事件发生地点")
+	private String happenAddress;
+
     @ApiModelProperty(value = "发生的精度纬度信息(逗号隔开)")
 	private String happentLatLng;
 

--
Gitblit v1.7.1