From 2d12350faf338e2f9b642c535822aa5082441719 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 10 十月 2022 11:12:19 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
index 80ec392..2adc442 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
@@ -114,7 +114,7 @@
/**当前调解处理结果*/
@ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
private String currentEventProcessResult;
- /**调解是否成果1未成果2已成果*/
+ /**调解是否成果1未成功2已成果*/
@ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成功2已成功")
private Integer eventSucceed;
/**事件结果（1、调解失败2、调解成功）*/
@@ -173,5 +173,8 @@
@TableField(exist = false)
private String keyword;
@TableField(exist = false)
- private String userType;
+ private Integer userType;
+ @ApiModelProperty("取消时间")
+ private Date revokeDate;
+
}
--
Gitblit v1.7.1