Merge branch 'devlop' into devlop_whxrwms

skyouc

7 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

 rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java

@@ -44,7 +44,7 @@
    @ExceptionHandler(BusinessException.class)
    public R businessExceptionHandler(BusinessException e, HttpServletResponse response) {
        CommonUtil.addCrossHeaders(response);
        return R.error(e.getMessage());
        return R.parse(e.getMessage());
    }

    @ResponseBody