From 06ceee5a4f820ebb19dd66388c958d8638fa1b54 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期日, 09 十月 2022 16:30:55 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
index 9fe832f..6614860 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
@@ -132,4 +132,7 @@
 	private String categoryName;
 	@ApiModelProperty("当前调解部门")
 	private String currentOrgName;
+	@ApiModelProperty("用户取消时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date revokeDate;
 }

--
Gitblit v1.7.1