From 8ee3531169978ab1acf0b8bfb12ec22b3d828a56 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 09:13:24 +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/EventTransferRecordVO.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java
index 108b81a..2de6de8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java
@@ -37,7 +37,7 @@
 	private Integer toType;
 
     @ApiModelProperty(value = "事件下游机构或网格员")
-	private Long to;
+	private Long toId;
 
     @ApiModelProperty(value = "需要办理人路径名称")
 	private String toName;
@@ -53,5 +53,13 @@
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date createAt;
 
+	@ApiModelProperty(value = "音频")
+	private List<EventResourceVO> audios;
+
+	@ApiModelProperty(value = "视频")
+	private List<EventResourceVO> videos;
+
+	@ApiModelProperty(value = "图片")
+	private List<EventResourceVO> pics;
 
 }

--
Gitblit v1.7.1