Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 b44fa8f69b986a76c687da53b78f6611f6dc53c0

 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;