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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -60,7 +60,7 @@
    private String happenAddr;


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