From 8d84ca36593e33de7e0b604824c471db3587fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 一月 2020 16:53:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index 6c46314..c519bd8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -252,6 +252,7 @@
 		goodsInfo.setState(goods.getState() == null ? 0 : goods.getState());
 		goodsInfo.setSalesCount(goods.getSalesCount());
 		goodsInfo.setPicUrl(goods.getPictUrl());
+		goodsInfo.setDescription(goods.getDescription());
 
 		Integer shopType = goods.getUserType();
 		if (shopType != null && shopType == 1) {
@@ -359,6 +360,7 @@
 		goodsInfo.setTitle(goods.getTitle());
 		goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
 		goodsInfo.setZkPrice(goods.getZkPrice());
+		goodsInfo.setDescription(goods.getDescription());
 
 		String provcity = goods.getProvcity();
 		if (!StringUtil.isNullOrEmpty(provcity)) {

--
Gitblit v1.8.0