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

yujian

2019-12-19 bb07147aaa96d1ef4c99e358dbbe7dad160dc62a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -340,6 +340,11 @@
      for (String img : tb.getImgList()) {

         finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));

      }

		
      if (finalImgList.size() == 0) {

         finalImgList.add(tb.getPictUrl());

      }

		
      if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))

         finalImgList.add(0, tb.getPictUrlWhite());