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

lidongdong

2022-10-08 4780ff616a56eca7a868cba8aa76217ce5577471

 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java

@@ -39,7 +39,7 @@
        Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
        if (currentUserId != null) {
            //从数据库中查询并返回
            return userService.getUserById(currentUserId);
            return userService.selectData(currentUserId+"");
        }
        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
    }