From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index d5df5b2..5ea4058 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -272,6 +272,9 @@
if (StringUtil.isNullOrEmpty(shopLink)) {
taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));
}
+
+ if(StringUtil.isNullOrEmpty(taoBaoShop.getShopIcon()))
+ taoBaoShop.setShopIcon(dynamicShopInfo.getShopIcon());
DynamicInfo dynamicVO = new DynamicInfo();
dynamicVO.setId(brandId);
--
Gitblit v1.8.0