Merge branch 'zzj' into 'test'

罗元桥

2021-08-21 ac3ee0c313a9eda72270ff3a141345685e3490e3

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

@@ -22,7 +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;

}