From 3358b2c450ed5aebfa1ee1aa5f699581b18593a7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 01 三月 2022 15:48:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 59403a8..10b4f23 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -224,7 +224,7 @@
      * @return 人员详情
      */
     @PostMapping("detailuser")
-    R detailUser(@RequestParam("userId") Long userId);
+    R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);
 
     /**
      * 设置用户标签

--
Gitblit v1.7.1