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

huanghongfa

2021-08-13 c9d1bf762e05e8a83cda1da6c56f4bd96d3b67fc

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java

@@ -22,4 +22,13 @@
    @ApiModelProperty("邻里圈查询类型（1.热门 2.最新 3.精品）")
    private Integer type = 1;

    @ApiModelProperty("话题id")
    private Long topicId;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

}