From a06983bbdfd4b02b2c5791751a69ea2e837ea1c2 Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Thu, 7 Mar 2024 14:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=BF=AB=E4=BA=868=E4=B8=AA=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyl/manager/oms/pojo/vo/ManagerOrderVO.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java
index bb85206..df70dff 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java
@@ -1,11 +1,12 @@
 package com.cyl.manager.oms.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -52,16 +53,19 @@ public class ManagerOrderVO {
     private BigDecimal payAmount;
 
     @ApiModelProperty(name = "createTime",value = "下单时间",required = true,dataType = "Date")
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
 
     @ApiModelProperty(name = "payTime",value = "支付时间",required = true,dataType = "Date")
-    private Date payTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime payTime;
 
     @ApiModelProperty(name = "payType",value = "支付方式 支付方式：0->未支付；1->支付宝；2->微信",required = true,dataType = "Integer")
     private Integer payType;
 
     @ApiModelProperty(name = "receiveTime",value = "确认收货时间",required = true,dataType = "Date")
-    private Date receiveTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime receiveTime;
 
     @ApiModelProperty(name = "note",value = "备注",required = true,dataType = "String")
     private String note;
@@ -76,7 +80,8 @@ public class ManagerOrderVO {
     private List<ManagerOrderProductVO> productList;
 
     @ApiModelProperty(name = "deliveryTime",value = "发货时间",required = true,dataType = "LocalDataTime")
-    private Date deliveryTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime deliveryTime;
 
     @ApiModelProperty(name = "deliverySn",value = "物流单号",required = true,dataType = "String")
     private String deliverySn;