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

huanghongfa

2022-04-14 e378405bd2968d78d1ddf43b5e326f19d39fa4a3

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

@@ -63,4 +63,6 @@

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

    private String description;
}