From 5d1e6dbb4a9abff2ef984058914b73e7f2ced736 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 20:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
index 0e63a5f..1e959d2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
@@ -102,10 +102,14 @@
      */
     private Date happenTime;
     /**
-     * 发生地点   列: happent_address
+     * 事件发生地点备注   列: happent_address
      */
     private String happentAddress;
     /**
+     * 事件发生地点      列: happen_address
+     */
+    private String happenAddress;
+    /**
      * 发生的精度纬度信息(逗号隔开)   列: happent_lat_lng
      */
     private String happentLatLng;

--
Gitblit v1.7.1