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

yujian

2019-07-31 617312cbc114c6ac38c8eb4a8bcda583c33dd72f

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

@@ -116,8 +116,7 @@
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,

                     shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate,   shareRate);

               array.add(gson.toJson(goodsDetailVO));

            }

         }