From 774cb0ede0572062f025132a5c2a0262188abf05 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Jul 2021 09:53:11 +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/QueryGoodsCategoryListVo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java
index b82208c..b53b1d0 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java
@@ -21,9 +21,9 @@
private Long parentId;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value="创建时间")
- private Date createdTime;
+ private String createTime;
@ApiModelProperty(value="创建人")
private String createdBy;
--
Gitblit v1.9.1