From 4fa67c8de0fe4c3726a0b84db38316568768506c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 25 十二月 2018 14:46:00 +0800
Subject: [PATCH] Merge branch 'dev1'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index bf6ba6f..0935fbe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1572,7 +1572,7 @@
 				goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));
 				TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
 						proportion.toString(), "");
-				taoBaoGoodsBriefExtra.setCreatetime(commonGoods.getCreateTime());
+				taoBaoGoodsBriefExtra.setCreatetime(collectionGoodsV2.getCreateTime());
 				
 				list.add(taoBaoGoodsBriefExtra);
 			}

--
Gitblit v1.8.0