Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2 天以前 bd1d4feea4f9522c69ef4c0fd72b1221eae5201f

 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