From 385c2ed1fddb5604e57d6da8b96ca1092e922a85 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 15 Jun 2022 16:35:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E5=B7=B2?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderDetailController.java | 1 + .../src/main/java/com/ghy/web/pojo/vo/OrderStandard.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 23371506..174fb1cb 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -194,6 +194,7 @@ public class OrderDetailController extends BaseController { orderStandard.setStandardName(orderGoods.getGoodsName()); orderStandard.setStandardNum(orderGoods.getGoodsNum()); orderStandard.setServerNum(orderGoods.getServerGoodsNum()); + orderStandard.setFinishTime(orderGoods.getFinishTime()); standardList.add(orderStandard); } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java index dda33a0f..af6aa646 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java @@ -1,7 +1,10 @@ package com.ghy.web.pojo.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + @Data public class OrderStandard { @@ -11,4 +14,7 @@ public class OrderStandard { private Integer serverNum; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date finishTime; + }