Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-10 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2

 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);