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

liyong

18 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

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

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

    }



    @Override

    public String getMessage()

    {

        return message;