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

huanghongfa

2021-04-28 43c6e133a84d50f4952cd1df2f409d07be338cc4

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

@@ -98,6 +98,9 @@
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "社区名称")
    private String communityName;

    @ApiModelProperty(value = "当前页数",example="1")
    private Long pageNum;