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

CeDo

2021-06-04 c7c38dfd96047930999bcd7cf62d18d6d8651108

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java

@@ -47,6 +47,10 @@
    @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
    private String happentAddress;

    @Length(max=255)
    @ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
    private String happenAddress;

    //位置备注
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)