Merge branch 'test_future_wangge' into test

CeDo

2021-06-07 f1afc9dd47bc8e9d4d2c86a5bbd099ee0d7824f2

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

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

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

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

}