Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 f4d47d91a8bf41426497a0c42c10f5a78af0259b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java

@@ -60,12 +60,15 @@
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
    private Integer type;

    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty(value = "父类id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;

    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    private String description;