From 1da9a96fd9f1031d81d5d829a2df18fd4ac5abd1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 14:42:48 +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/ViewGoodsCategoryListVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsCategoryListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsCategoryListVo.java
index 6eb7fae..4607cae 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsCategoryListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsCategoryListVo.java
@@ -24,7 +24,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value="创建时间")
- private Date createdTime;
+ private Date createTime;
@ApiModelProperty(value="创建人")
private String createdBy;
--
Gitblit v1.9.1