Merge remote-tracking branch 'origin/master'

huanghongfa

2021-03-30 bd563bebae7b472fadbf348ec85367bbda3f3193

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

@@ -7,6 +7,7 @@

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;

/**
@@ -81,4 +82,7 @@

    @ApiModelProperty("距离-单位米")
    private String distance;

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