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

liyong

昨天 7558d3cb61282e41e27f85f56e829c6e6409f66d

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

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

    }



    @Override

    public String getMessage()

    {

        return message;