Merge remote-tracking branch 'origin/test' into test

CeDo

2021-06-04 c7c38dfd96047930999bcd7cf62d18d6d8651108

 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;