From c06b2f5b2aa6d8910664b30ab4f74ff3895ebbeb Mon Sep 17 00:00:00 2001 From: liyj <15602261488@163.com> Date: Fri, 20 Sep 2024 10:27:45 +0800 Subject: [PATCH] Merge branch 'master' into gzdyh_test --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java index 8eb375d..c0361a9 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java @@ -1,8 +1,10 @@ package cn.huge.module.cases.domain.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -59,12 +61,12 @@ /** * 实际调解部门编号(承办部门) */ - private String mediateDeptId; + private String mediateUnitId; /** * 实际调解部门名称(承办部门) */ - private String mediateDeptName; + private String mediateUnitName; /** * 实际调解部门编号(配合部门) @@ -86,6 +88,28 @@ * 登记组织名称 */ private String inputUnitName; + /** + * 办结时间 + */ + private Date closeTime; + /** + * 登记时间 + */ + private Date createTime; + /** + * 达成协议类型 + */ + private String agreeType; + + /** + * 达成协议类型名称 + */ + private String agreeTypeName; + + /** + * 已达成协议 + */ + private String agreeContent; /** * 申请人集合 -- Gitblit v1.8.0