From abb0d631ffed8b67b0a78205ba127b46a4cb546b Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 16:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
index 3987eb2..e3fc8c3 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
@@ -1,5 +1,6 @@
 package cn.huge.module.cases.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,13 +8,25 @@
 @Data
 public class FrontPageListDTO {
     /**
+     * 所属编号
+     */
+    private String ownerId;
+
+    /**
+     * 事项ID
+     */
+    private String caseId;
+
+    /**
      * 流转时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
     private Date turnaroundTime;
 
     /**
      * 时限
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
     private Date timeLimit;
 
     /**
@@ -44,7 +57,7 @@
     /**
      * 已办天数
      */
-    private Integer processingDays;
+    private Long processingDays;
 
     /**
      * 承办部门
@@ -81,5 +94,8 @@
      */
     private String opinion;
 
-
+    /**
+     * 事项状态
+     */
+    private String process;
 }

--
Gitblit v1.8.0