Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 a934e3e3ae90b2bf7b564426387be5b9343bad07

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

@@ -60,4 +60,7 @@

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

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