Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

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

@@ -27,6 +27,8 @@
    @ApiModelProperty("发布人")
    private String releaseName;

    @ApiModelProperty("话题名称")
    private String topicName;

    @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台",hidden = true)
    private Integer userType;