Merge branch 'huacheng' into huacheng_paicha

101captain

2022-04-28 a33990498e32fda774dacf849bfcd660c58da8e7

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

@@ -19,9 +19,6 @@
    @ApiModelProperty("id")
    private Long id;

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

    @ApiModelProperty("话题名字")
    private String name;

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

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