From 0e2d23c4ff1f12413ac9fe34632ef3d72e7e7d9e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 13:48:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
index 873f6e2..269b9f5 100644
--- a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
+++ b/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);
     }
 }

--
Gitblit v1.7.1