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

rk

3 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

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

@@ -21,7 +21,6 @@
@Slf4j
@Service
public class ApiController {

    @Autowired
    public MemberService memberService;

@@ -34,6 +33,7 @@
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        return request;
    }

    /**
     * 获取用户ID
     *