From fde937ab595fdb946bed4537e41b398323d8df8b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 11 十月 2022 09:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 2 --
1 files changed, 0 insertions(+), 2 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 7d987dc..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,9 +41,7 @@
//从数据库中查询并返回
return userService.selectData(currentUserId+"");
}
-
return null;
-
// throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
}
}
--
Gitblit v1.7.1