From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseReturn.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseReturn.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseReturn.java
index 53b39ba..e5a30d7 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseReturn.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseReturn.java
@@ -1,5 +1,7 @@
package cn.huge.module.cases.domain.po;
+import cn.huge.module.sys.dto.FileInfoBaseDTO;
+import cn.huge.module.sys.dto.FileTypeInfoBaseDTO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -7,6 +9,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @title: 纠纷回退信息表数据库对应关系类
@@ -81,6 +84,12 @@
private String caseTaskId;
/**
+ * 纠纷任务类型，1：承办，2：配合
+ */
+ @TableField(value = "case_task_type")
+ private Integer caseTaskType;
+
+ /**
* 回退审核组织编号
*/
@TableField(value = "audit_unit_id")
@@ -108,7 +117,7 @@
* 回退审核时间
*/
@TableField(value = "audit_time")
- private String auditTime;
+ private Date auditTime;
/**
* 回退审核结果
@@ -125,8 +134,8 @@
/**
* 回退审核理由
*/
- @TableField(value = "audit__content")
- private String audit_content;
+ @TableField(value = "audit_content")
+ private String auditContent;
/**
* 删除状态，0：未删除，1：已删除
@@ -153,4 +162,10 @@
@TableField(value = "update_time")
private Date updateTime;
+ /**
+ * 附件列表
+ */
+ @TableField(exist = false)
+ private List<FileInfoBaseDTO> fileInfoList;
+
}
--
Gitblit v1.8.0