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

CeDo

2021-04-29 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java

@@ -28,8 +28,10 @@
    private String createAt;
    @ApiModelProperty("人员头像")
    private String imageUrl;
    @ApiModelProperty(value = "人员头像",hidden = true)
    @ApiModelProperty(value = "是否是志愿者",hidden = true)
    private Integer isVolunteer;
    @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者",hidden = true)
    private Integer type;
    @ApiModelProperty("人员主键")
    private Long userId;
}