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

CeDo

2021-05-07 70790f9dc88f026fb16159656014ca609e95f656

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

@@ -83,4 +83,15 @@
    @ApiModelProperty("是否已经点赞 1 是 2 否")
    private Integer haveSign;

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    @ApiModelProperty("发布类型（1.小程序发布  2.后台发布）")
    private Integer type;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;
}