Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

business/base-service/src/main/java/com/yihu/jw/article/service/BaseMenuManageService.java

@@ -784,7 +784,7 @@ public class BaseMenuManageService {
        if(!"1".equals(isContent)){
            sqlTmp =  "  null  content ," ;
        }
        String sql = "select id   ,\n" +
        String sql = "select a.id   ,\n" +
                "  title   ,\n" +
                "  subtitle   ,\n" +
                "  intro   ,\n" +