Merge remote-tracking branch 'origin/master'

Administrator

2018-12-10 94c29daf7cb722635c1735e8d8bd403105e999d8

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java

@@ -245,7 +245,9 @@
               commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));

            }



            String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null));

            String json = gson

                  .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate));




            dataObject.put("groupId", userShareGoodsGroup.getId());

            dataObject.put("goods", json);