Merge remote-tracking branch 'origin/div' into div

admin

2019-08-27 e6764831a890de26fcfebb4fb8f3a22e9f8cc816

 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) {// 商品信息过滤