Merge branch 'test' into 'master'

罗元桥

2021-08-11 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767

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

@@ -111,10 +111,10 @@
    private String cancelReason;

    @ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名")
    private Integer isSign;
    private Integer isSign = 0;

    @ApiModelProperty(value = "是不是以志愿者身份报名的 1 是 0 不是")
    private Integer isVolunteer;
    private Integer isVolunteer = 0;

    @ApiModelProperty(value = "当前登录者id",hidden = true)
    private Integer userId;