Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-12 e6b362f0b56ab17bc839ab6c8b1956c6a59a9c53

 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);
    }
}