From 9812d8889b2fcee14851e6114439e06349ef25e8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 06 六月 2021 02:14:53 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml                          |    6 ++++--
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java |    5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
index b5a4319..77a1006 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
@@ -20,9 +20,12 @@
     @ApiModelProperty("事件标题")
     private String eventTitle;
 
-    @ApiModelProperty("发生地点")
+    @ApiModelProperty("发生地点备注")
     private String happentAddress;
 
+    @ApiModelProperty("发生地点位置")
+    private String happenAddress;
+
     @ApiModelProperty("发生的精度纬度信息(逗号隔开)")
     private String happentLatLng;
 
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
index 0dddec3..2acc799 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -395,8 +395,9 @@
 		SELECT
 			id,
 			event_type AS type,
-			event_title AS eventTitle,
+			event_des AS eventTitle,
 			happent_address AS happentAddress,
+			happen_address AS happenAddress,
 			happent_lat_lng AS happentLatLng
 		FROM
 			`event`
@@ -409,8 +410,9 @@
 		SELECT
 			id,
 			IFNULL( NULL, 7 ) AS type,
-			event_title AS eventTitle,
+			event_des AS eventTitle,
 			happent_address AS happentAddress,
+			happen_address AS happenAddress,
 			happent_lat_lng AS happentLatLng
 		FROM
 			event_visiting_tasks

--
Gitblit v1.7.1