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

lidongdong

2022-10-09 eb921ab9b384a87a02aadb4d0e67f6118e293f81

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

@@ -41,6 +41,7 @@
            //从数据库中查询并返回
            return userService.selectData(currentUserId+"");
        }
        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
        return null;
//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
    }
}