From 5d1e6dbb4a9abff2ef984058914b73e7f2ced736 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 20:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
index b135f49..5d966cc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
@@ -27,6 +27,9 @@
     @ApiModelProperty(value = "服务单号")
 	private String orderSn;
 
+	@ApiModelProperty(value = "事件类型")
+    private String EventClazz;
+
     @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
 	private Long eventCategory;
 
@@ -48,6 +51,9 @@
     @ApiModelProperty(value = "网格员名字")
 	private String gridMemberName;
 
+	@ApiModelProperty(value = "网格员头像")
+	private String gridMemberImageUrl;
+
     @ApiModelProperty(value = "网格员联系方式")
 	private String gridMemberTelephone;
 

--
Gitblit v1.7.1