Merge remote-tracking branch 'origin/master'

jiangping

2024-07-19 bf99ae66d14857dfcd97dc6ccb8e82a38d3bd75f

 server/web/src/main/java/com/doumee/api/web/ApiController.java

@@ -42,7 +42,6 @@
        return request;
    }


    /**
     * 获取用户ID
     *
@@ -75,7 +74,6 @@
        Member user = memberService.findById(userId);
      return user;
    }


    protected Long getUserType() {
        Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserType);