Merge remote-tracking branch 'origin/wb' into cjl

cjl

2023-10-20 fb89f40499211dae5d74caf3cea2ea696745e7a2

 screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java

@@ -42,7 +42,7 @@
    @ResponseBody
    @ResponseStatus(HttpStatus.OK)
    public ResultMessage handleUserNotExistException(BusinessException ex) {
        return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), "请求用户数据失败");
        return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ex.getMsg());
    }

    @ExceptionHandler