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

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

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

@@ -157,7 +157,7 @@
    private Integer isVolunteer = 0;

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

    @ApiModelProperty("活动参加普通人员集合")
    private List<ActivitySignVO> activitySignVOList;