Merge remote-tracking branch 'origin/dev' into dev

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

 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;
}