From 493aa6cef3d036702558bde1a6994dff705e12c1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 12 十月 2022 10:41:42 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' 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