Merge branch 'test_warehouse' of http://gitlab.nhys.cdnhxx.com/root/zhihuis...

101captain

2021-10-14 9bee54a71a0121009969ecc55b2839c4f32887df

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

@@ -35,4 +35,6 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("随手拍条数")
    private Integer count;
}