Merge branch 'master' into test

puhanshu

2021-12-29 ca4034c3a285f2c22fa19e5eaa88d505b5588c0b

 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;