Merge branch 'master' of shikejing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlArticleContentService.java

@@ -73,7 +73,7 @@ public class ZjxlArticleContentService extends BaseService {
    }
    public List<ZjxlArticleContent> getLeftTabs(String articleContentType){
        String sql = "select * from zjxl_article_content where article_content_type = "+articleContentType+" group by article_content_classify,article_content_subclassify";
        String sql = "select * from zjxl_article_content where article_content_type = "+articleContentType+" group by article_content_classify";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }