Merge remote-tracking branch 'origin/master'

yujian

2019-07-18 0a3e5a876724ac247b33632300701077098111eb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java

@@ -88,7 +88,7 @@
      }



      CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),

            cid, page, Constant.PAGE_SIZE);

            cid, page, 10);



      // 保留暂时不开启，待后续开启

      List<SwiperPicture> bannerList = new ArrayList<>();