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

CeDo

2021-06-03 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3

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

@@ -43,6 +43,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)