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

admin

2019-12-28 1c8b5d11b68e727ef5ccc130327e2400f937321b

 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();