From 79d022f98239e5f029bdca3adf38ca4a39e15143 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期三, 14 九月 2022 16:14:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java index 62d09a9..a475b21 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java @@ -93,6 +93,13 @@ /**当前机构下处理人名称*/ @ApiModelProperty(name = "currentProcessUserName", value = "当前机构下处理人名称") private String currentProcessUserName; + /**当前调解处理结果*/ + @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果") + private String currentEventProcessResult; + /**调解是否成果1未成果2已成果*/ + @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果") + private Integer eventSucceed; + /**撤销描述*/ @ApiModelProperty(name = "revokeDes", value = "撤销描述") private String revokeDes; @@ -138,5 +145,7 @@ /**修改时间*/ @ApiModelProperty(name = "updateAt", value = "修改时间") private Date updateAt; - + + private Long pageNo; + private Long pageSize; } -- Gitblit v1.7.1