Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

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

@@ -33,7 +33,7 @@
    @ApiModelProperty(value = "发生地址", hidden = false, example = "")
    private String happenAddr;

    @NotBlank() @Length(max=100)
    @NotBlank(message = "地址备注不能为空") @Length(max=100)
    @ApiModelProperty(value = "地址备注", hidden = false, example = "")
    private String addrRemark;