Merge remote-tracking branch 'origin/master'

admin

2019-06-26 cc88c71f8c92fab3cc17381b4a75eee7acc9a642

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

@@ -112,6 +112,8 @@
         navList = getCommonNav();

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

         navList = getCommonNav();

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

         navList = getCommonNav();

      }



      return navList;