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

yujian

2019-08-22 11c098089f8c4714188e91032e5a19e8fe94bf96

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

@@ -145,7 +145,7 @@
      } else if (type == CommonContentTypeEnum.chaoPinReMai) {

         navList = getCommonNav();

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

         navList = getCommonNav();

         navList = new ArrayList<>();

      }



      return navList;