From 69790994b403a61e92a20cef7451b7f087b50ad2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 31 Oct 2023 17:16:47 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/controller/AllocationController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index 62e2ce0..92cb30c 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -20,11 +20,12 @@
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+
 import org.springframework.web.bind.annotation.*;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.HashMap;
+
 import java.util.List;
 import java.util.Map;
 
@@ -39,7 +40,9 @@
 import com.moral.api.utils.NoModelWriteData;
 import com.moral.constant.Constants;
 import com.moral.constant.ResultMessage;
+import com.moral.util.DateUtils;
 import com.moral.util.WebUtils;
+
 
 import javax.validation.Valid;
 
@@ -134,6 +137,7 @@
         allocationVo.setFileChangeList(allocationext.getFileChangeList());
         allocationVo.setFileApproveList(allocationext.getFileApproveList());
         allocationVo.setApproveList(allocationext.getApproveList());
+        allocationVo.setTime(DateUtils.dateToDateString(allocationVo.getEscalationTime(), DateUtils.yyyy_MM_dd_CN));
         return ResultMessage.ok(allocationVo);
     }
     @GetMapping("remove")

--
Gitblit v1.8.0