From 3ce88c43c6d09cd5595c57e945513cd814fd9c34 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 22 Dec 2023 14:01:18 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E8=A1=A5=E5=85=85=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5JSON=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=8C=96=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/process/esRevision/entity/ProcessEsRevision.java | 4 ++++
 .../process/esRevision/entity/vo/OtherDraftUserVO.java        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
index 13ef062c..93e7aa21 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
@@ -9,11 +9,13 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.modules.activiti.process.esRevision.entity.vo.InspectContentVO;
 import com.jero.modules.activiti.process.esRevision.entity.vo.OtherDraftUserVO;
 import com.jero.modules.activiti.process.esRevision.entity.vo.ReviewMeetingDetailVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 
@@ -139,6 +141,8 @@ public class ProcessEsRevision implements Serializable {
      * 评审日期
      */
     @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "评审日期")
     private Date reviewDate;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java
index 182867d4..753a5f1e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java
@@ -1,7 +1,9 @@
 package com.jero.modules.activiti.process.esRevision.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,6 +25,8 @@ public class OtherDraftUserVO {
     @ApiModelProperty(value = "起草范围")
     private String scope;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "截止日期")
     private Date deadline;