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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 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;

/**
@@ -83,6 +84,5 @@
    private String distance;

    @ApiModelProperty("街道Id")
    @NotBlank(groups = {AddGroup.class},message = "街道Id不能为空")
    private Integer streetId;
    private Long streetId;
}