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

lidongdong

2022-10-09 e76d382202ed5c8286b09593e05b2c36acde1c0f

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

@@ -41,9 +41,7 @@
            //从数据库中查询并返回
            return userService.selectData(currentUserId+"");
        }

        return null;

//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
    }
}