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/service/GoodsService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 4e2213d..9e9985a 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -184,7 +184,7 @@
             ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
             viewGoodsVo = objectMapper.convertValue(scoreGoods, ViewGoodsVo.class);
-            viewGoodsVo.setCreateTime(scoreGoods.getCreatedTime());
+//            viewGoodsVo.setCreateTime(scoreGoods.getCreatedTime().toString());
             //轮播图
             List<String> goodsImages = scoreGoodsImagesMapper.selectScoreGoodsImagesByGoodsId(id);
             viewGoodsVo.setGoodsImages(goodsImages);

--
Gitblit v1.9.1