From b311ca2f01e9602c1bf8caab04b4d641b314e341 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 29 Sep 2024 12:48:09 +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/dto/CaseInfoWeExcelDTO.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
index f88aaa8..0e1199a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
@@ -9,8 +9,12 @@
  */
 @Data
 public class CaseInfoWeExcelDTO {
-    @ExcelProperty(value="事项状态")
-    private String statusName;
+    @ExcelProperty(value="登记时间")
+    private String createTime;
+    @ExcelProperty(value="登记机构")
+    private String inputUnitName;
+    @ExcelProperty(value="问题归属地")
+    private String areaName;
     @ExcelProperty(value="事项来源")
     private String canalName;
     @ExcelProperty(value="事项等级")
@@ -18,17 +22,16 @@
     @ExcelProperty(value="纠纷类型")
     private String caseTypeName;
     @ExcelProperty(value="承办部门")
-    private String mediateDeptName;
-    @ExcelProperty(value="配合部门")
-    private String assistUnitName;
-    @ExcelProperty(value="化解结果")
-    private String mediResultName;
+    private String mediateUnitName;
+    @ExcelProperty(value="事项状态")
+    private String statusName;
     @ExcelProperty(value="办结时间")
     private String closeTime;
+    @ExcelProperty(value="化解结果")
+    private String mediResultName;
     @ExcelProperty(value="申请人")
-    private String plaintiffStr;
+    private String plaintiffs;
     @ExcelProperty(value="被申请人")
-    private String defendantStr;
-    @ExcelProperty(value="登记机构")
-    private String inputUnitName;
+    private String defendants;
+
 }

--
Gitblit v1.8.0