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/service/impl/goods/PDDCommonTemplateContentServiceImpl.java

@@ -29,7 +29,7 @@
            || type == PDDCommonContentTypeEnum.brandClear) {

         return PinDuoDuoApiUtil.searchByChannelType(page - 1, pageSize, type.getContent());

      } else if (type == PDDCommonContentTypeEnum.hotSaleGoods) {

         return pddGoodsService.getTopGoodsList(page, 1);

         return pddGoodsService.getTopGoodsList(page, 2);

      }

      return null;

   }