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

huanghongfa

2021-05-21 fa585b56961f3af82a601cf549d0d42fe4ff6d45

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

@@ -25,4 +25,7 @@
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

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

}