Merge remote-tracking branch 'origin/div' into div

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -448,8 +448,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));

               }

            }