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/grid/EventResourceVO.java

@@ -1,6 +1,9 @@
package com.panzhihua.common.model.vos.grid;

import java.util.*;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +25,7 @@
   private Integer classification;

    @ApiModelProperty(value = "事件或者走访任务关联ID")
   @JsonSerialize(using = ToStringSerializer.class)
   private Long id;

    @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)")