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

zss

昨天 40946ba6c24a0318f14cbed603f0ed9cad1da853

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

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

    }



    @Override

    public String getMessage()

    {

        return message;