From 9049dfd1cc1857527b9d307f36f8b29fd442e605 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 20 Nov 2023 16:54:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esAbolish/entity/ProcessEsAbolish.java     | 10 ++++++++++
 .../process/esArchive/entity/ProcessEsArchive.java     | 10 ++++++++++
 .../process/esChange/entity/ProcessEsChange.java       | 10 ++++++++++
 .../process/esEnable/entity/ProcessEsEnable.java       | 10 ++++++++++
 .../process/esRecheck/entity/ProcessEsRecheck.java     | 10 ++++++++++
 5 files changed, 50 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java
index e9ce7077..506b69b1 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java
@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 企业标准
@@ -33,6 +35,8 @@ public class ProcessEsAbolish implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -45,6 +49,8 @@ public class ProcessEsAbolish implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
@@ -105,12 +111,16 @@ public class ProcessEsAbolish implements Serializable {
     /**
      * 发布日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "发布日期")
     private Date releaseDate;
 
     /**
      * 实施日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "实施日期")
     private Date implementationDate;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/ProcessEsArchive.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/ProcessEsArchive.java
index 36331a15..862bf255 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/ProcessEsArchive.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/ProcessEsArchive.java
@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 企业标准
@@ -34,6 +36,8 @@ public class ProcessEsArchive implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -46,6 +50,8 @@ public class ProcessEsArchive implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
@@ -106,12 +112,16 @@ public class ProcessEsArchive implements Serializable {
     /**
      * 发布日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "发布日期")
     private Date releaseDate;
 
     /**
      * 实施日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "实施日期")
     private Date implementationDate;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java
index cc2bf822..4ee5e21a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java
@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 企业标准
@@ -33,6 +35,8 @@ public class ProcessEsChange implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -45,6 +49,8 @@ public class ProcessEsChange implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
@@ -105,12 +111,16 @@ public class ProcessEsChange implements Serializable {
     /**
      * 发布日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "发布日期")
     private Date releaseDate;
 
     /**
      * 实施日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "实施日期")
     private Date implementationDate;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/ProcessEsEnable.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/ProcessEsEnable.java
index d792a06c..4f82697a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/ProcessEsEnable.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/ProcessEsEnable.java
@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 企业标准
@@ -33,6 +35,8 @@ public class ProcessEsEnable implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -45,6 +49,8 @@ public class ProcessEsEnable implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
@@ -105,12 +111,16 @@ public class ProcessEsEnable implements Serializable {
     /**
      * 发布日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "发布日期")
     private Date releaseDate;
 
     /**
      * 实施日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "实施日期")
     private Date implementationDate;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
index 5ff8468b..38f62b5f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 企业标准
@@ -34,6 +36,8 @@ public class ProcessEsRecheck implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -46,6 +50,8 @@ public class ProcessEsRecheck implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
@@ -82,12 +88,16 @@ public class ProcessEsRecheck implements Serializable {
     /**
      * 发布日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "发布日期")
     private Date releaseDate;
 
     /**
      * 实施日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "实施日期")
     private Date implementationDate;