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

yujian

2019-07-29 ac208d6f60284be820fe82dfdf44142f02d9e3ef

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -269,6 +269,8 @@
                  e.printStackTrace();

               }



               commonGoodsVO.setGoodsType(sourceType2);

					
               String picture = commonGoodsVO.getPicture();

               if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {

                  commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));