Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -905,6 +905,9 @@
            if (imgs != null && imgs.size() > 0) {

               for (GoodsPicture goodsPicture: imgs) {

                  TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();

                  if (goods == null) {

                     continue;

                  }

                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate, shareRate);

                  goodsPicture.setGoodsVO(detailVO);

                  goodsPicture.setGoods(null);