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

yanghui

2022-10-13 71df1c0a0a92ac0635e579d6a77d9ced7e9ccf23

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