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

yujian

2019-08-27 74be2e325a3bc4dbe95e9825c18574e1102877c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java

@@ -184,7 +184,7 @@
      } else if (type == CommonContentTypeEnum.haoQuan) {

         result = getHaoQuanContent(cid, page, pageSize);

      } else if (type == CommonContentTypeEnum.mianDan) {

         result = getHaoQuanContent(cid, page, pageSize);

         result = getMianDanContent(page, pageSize);

      }



      if (result != null) {// 商品信息过滤