From a88b63c52833433e9270f7641cb39aea9f872172 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 23 Sep 2024 15:35:35 +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 |   12 +++++++++---
 1 files changed, 9 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 e9b98bc..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
@@ -84,6 +84,12 @@
     private String caseTaskId;
 
     /**
+     * 纠纷任务类型,1:承办,2:配合
+     */
+    @TableField(value = "case_task_type")
+    private Integer caseTaskType;
+
+    /**
     * 回退审核组织编号
     */
     @TableField(value = "audit_unit_id")
@@ -111,7 +117,7 @@
     * 回退审核时间
     */
     @TableField(value = "audit_time")
-    private String auditTime;
+    private Date auditTime;
 
     /**
     * 回退审核结果
@@ -128,8 +134,8 @@
     /**
     * 回退审核理由
     */
-    @TableField(value = "audit__content")
-    private String audit_content;
+    @TableField(value = "audit_content")
+    private String auditContent;
 
     /**
     * 删除状态,0:未删除,1:已删除

--
Gitblit v1.8.0