From 1fbdd1f48a5ec551a4c044d4babd95633e36d62e Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期四, 03 六月 2021 21:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 e279344..574df92 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
@@ -18,7 +18,7 @@
 @ApiModel("事件或者走访中关联的图片音频和视频文件返回参数")
 public class EventResourceVO {
 
-    @ApiModelProperty(value = "分类(1、事件 2、走访)")
+    @ApiModelProperty(value = "分类(1、事件 2、走访 3、事件流转))")
 	private Integer classification;
 
     @ApiModelProperty(value = "事件或者走访任务关联ID")
@@ -33,6 +33,9 @@
     @ApiModelProperty(value = "资源大小")
 	private String resourceSize;
 
+	@ApiModelProperty(value = "资源时长")
+	private Integer resourceTime;
+
     @ApiModelProperty(value = "事件上传的资源URL地址")
 	private String url;
 

--
Gitblit v1.7.1