From 2e53c542b4dfac6d1e62c7a2e7d21a3984e797c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 11 十一月 2019 17:24:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
index 1d96481..fe32f59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
@@ -48,7 +48,7 @@
 		
 		BrandShopCahe brandShop = new BrandShopCahe();
 		brandShop.setBrandId(brandInfo.getId());
-		brandShop.setShop(ShopInfoVOFactory.convertTaoBaoShop(taoBaoShop));
+		brandShop.setShop(shopInfoVO);
 		brandShop.setCreateTime(new Date());
 		brandShopCaheDao.insert(brandShop);
 		return false;

--
Gitblit v1.8.0