Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

 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)