Merge branch 'huacheng_test' into huacheng

101captain

2022-06-24 21900bb8a3d70c02ba1165b73cdffcd64c8bba1d

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

@@ -60,4 +60,9 @@

    @ApiModelProperty(value = "父类id")
    private Long parentId;

    @ApiModelProperty("街道id")
    private Long streetId;

    private String description;
}