From f32e75ed3d34f31da74c0199d53139268e9cd560 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 28 八月 2023 11:53:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index 3b7a54e..5d8d92d 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.limslaboratory.pojo.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto;
 import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
 import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
 
@@ -80,4 +81,6 @@
      * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
      */
     List<Map<String, Object>> getUserNameAndId();
+
+    RoleAndMenuDto getUserRoleInfo(String token);
 }

--
Gitblit v1.9.3