Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java

@@ -195,8 +195,8 @@
   @Override

   public List<DaTaoKeDetailV2> listPreShareHotGoods(int page) {

      Map<Long, DaTaoKeDetailV2> map = new HashMap<>();

      List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Dao.listPreShareHotGoods((page - 1) * Constant.PAGE_SIZE,

            Constant.PAGE_SIZE, "monthSales");

      List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Dao.listPreShareHotGoods((page - 1) *100,

            100, "monthSales");

      System.out.println(list);

      for (DaTaoKeDetailV2 v2 : list) {

         map.put(v2.getId(), v2);