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

yujian

2019-12-31 db98bb27a9240893297531e1218239222c2ba9b1

 fanli/src/main/java/com/yeshi/fanli/controller/web/TLJFreeBuyGoodsController.java

@@ -113,7 +113,7 @@
      }



      // 最多10个商品

      List<TLJFreeBuyGoods> listGoods = tljFreeBuyGoodsService.listByDay(day, 10);

      List<TLJFreeBuyGoods> listGoods = tljFreeBuyGoodsService.listByDay(day, 100);

      

      JSONArray array = new JSONArray();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();