From 5d7662014240f84444c1c0a92c64ae0cabb261cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 12:22:55 +0800
Subject: [PATCH] 板栗快省名字修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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..71a95ef 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
@@ -148,7 +148,7 @@
 			buffer.append("         ");
 			buffer.append("鏃╁畨锝瀄n");
 			buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
-			buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
+			buffer.append("璐墿鐪侀挶鏉挎牀蹇渷App锛氥�愰個璇烽摼鎺ャ��");
 
 			content = content.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�").replaceAll("\\;", "\\锛�")
 					.replaceAll("\\!", "\\锛�").replaceAll("\\?", "\\锛�").replaceAll("\\:", "\\锛�");
@@ -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