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/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 04b6ccd..b135f49 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
@@ -21,6 +21,9 @@
     @ApiModelProperty(value = "id")
 	private Long id;
 
+	@ApiModelProperty(value = "事件处理状态")
+	private Integer eventDealStatus;
+
     @ApiModelProperty(value = "服务单号")
 	private String orderSn;
 
@@ -36,6 +39,9 @@
     @ApiModelProperty(value = "网格ID")
 	private Long gridId;
 
+	@ApiModelProperty(value = "网格名称")
+	private String gridName;
+
     @ApiModelProperty(value = "网格员")
 	private Long gridMemberId;
 

--
Gitblit v1.7.1