From 44400f2f3427791c5382b02d70c4c0ef8d0c49ed Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 14:47:41 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxOrderDetailsVo.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxOrderDetailsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxOrderDetailsVo.java
index b751713..85be79d 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxOrderDetailsVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxOrderDetailsVo.java
@@ -1,5 +1,6 @@
package com.xzx.gc.shop.vo;
+import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +18,10 @@
@ApiModelProperty(value = "下单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Date createTime;
+ private Date createdTime;
+
+ @ApiModelProperty(value = "下单时间")
+ private String createTime;
@ApiModelProperty(value = "缩略图")
private String thumb;
@@ -59,4 +63,8 @@
private String phone;
+ public void setCreatedTime(Date createdTime) {
+ this.createdTime = createdTime;
+ this.createTime = DateUtil.format(createdTime, "yyyy-MM-dd HH:mm:ss");
+ }
}
--
Gitblit v1.9.1