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

CeDo

2021-04-28 349dcfb34ce7f2e94a05fbb58b2fc93a6146ad46

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

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

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

}