From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java
index 068eb06..d4064ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java
@@ -32,10 +32,12 @@
/**当前调解处理结果*/
@ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
private String currentEventProcessResult;
- /**调解是否成果1未成果2已成果*/
+ /**调解是否成果1未成功2已成功*/
@ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
private Integer eventSucceed;
/**调解上传图片地址列表，逗号进行分割*/
@ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
private List<ComEventRequestImageVO> images;
+ @ApiModelProperty("处理人")
+ private String solver;
}
--
Gitblit v1.7.1