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

liyong

昨天 3b94346fea3e6bdc74232615a11a764d0481383a

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

@@ -18,11 +18,10 @@
    {

        StringWriter sw = new StringWriter();

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

        String str = sw.toString();

        return str;

        return sw.toString();

    }



    public static String getRootErrorMseeage(Exception e)

    public static String getRootErrorMessage(Exception e)

    {

        Throwable root = ExceptionUtils.getRootCause(e);

        root = (root == null ? e : root);