Merge branch 'master' into pim_meet

buhuazhen

8 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 src/main/java/com/ruoyi/common/exception/ServiceException.java

@@ -49,6 +49,7 @@
        return detailMessage;

    }



    @Override

    public String getMessage()

    {

        return message;