Merge remote-tracking branch 'origin/master'

maven

昨天 9fb6f5adf9f63deffd377c001aaab8ffeae4c742

 src/main/java/com/ruoyi/common/utils/ExceptionUtil.java

@@ -18,8 +18,7 @@
    {

        StringWriter sw = new StringWriter();

        e.printStackTrace(new PrintWriter(sw, true));

        String str = sw.toString();

        return str;

        return sw.toString();

    }



    public static String getRootErrorMessage(Exception e)