From 25addae2c76fbd22145ea5f73b10d755d060dac0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 10 十月 2022 17:23:28 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 8 ++++++--
1 files changed, 6 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 fa182e7..7c9756f 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、调解成功）*/
@@ -174,5 +174,9 @@
private String keyword;
@TableField(exist = false)
private Integer userType;
-
+ @ApiModelProperty("取消时间")
+ private Date revokeDate;
+ @ApiModelProperty("专家头像")
+ @TableField(exist = false)
+ private String expertAvatar;
}
--
Gitblit v1.7.1