From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
index b76f876..17825aa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
+++ b/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是是视频)")
@@ -33,6 +37,9 @@
     @ApiModelProperty(value = "资源大小")
 	private String resourceSize;
 
+	@ApiModelProperty(value = "资源时长")
+	private Integer resourceTime;
+
     @ApiModelProperty(value = "事件上传的资源URL地址")
 	private String url;
 

--
Gitblit v1.7.1