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

admin

2020-05-26 8d83c7c3595c1869cd4f406fb106ce59a2fb99ce

 fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java

@@ -226,7 +226,7 @@
         JDSearchFilter jdfilter = new JDSearchFilter();

         jdfilter.setPageNo(page);

         jdfilter.setPageSize(Constant.PAGE_SIZE);

         result =JDApiUtil.getJingFenGoods(page,15); //JDUtil.searchByKey(jdfilter);

         result =JDApiUtil.getJingFenGoods(page,125); //JDUtil.searchByKey(jdfilter);

      }

      if (result != null && result.getGoodsList() != null)

         Collections.shuffle(result.getGoodsList());