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

admin

2019-11-25 e65037e672ecab852e2a6c5b242cdadfd1a58b33

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

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

         jdfilter.setPageNo(page);

         jdfilter.setPageSize(Constant.PAGE_SIZE);

         result = JDUtil.searchByKey(jdfilter);

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

      }

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

         Collections.shuffle(result.getGoodsList());