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

yujian

2019-08-01 ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java

@@ -514,7 +514,7 @@
    * @param out

    */

   private void getIndexPDDGoods(AcceptData acceptData, int page, PrintWriter out) {

      PDDGoodsResult result = pddGoodsService.getIndexPDDGoods(page);

      PDDGoodsResult result = pddGoodsService.getTopGoodsList(page, 1);

      int count = 0;

      JSONArray array = new JSONArray();

      if (result != null) {