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

DESKTOP-71BH0QO\L、ming

2021-05-10 b7ee93df9c0f10ce17431fd1ef33506742977b82

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

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

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

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

}