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

yujian

2019-07-25 a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d

 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<>();