From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl

---
 screen-api/src/main/java/com/moral/api/service/UserService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 90e5581..6336d44 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -23,8 +23,8 @@
     //������
     Map<String, Object> login(Map<String, Object> parameters);
 
-    //������token������������������
-    Map<String,Object> getUserInfo(String token);
+    //������������������������
+    Map<String,Object> getCurrentUserInfo();
 
     //������������
     Map<String, Object> getMenus(Map<String, Object> parameters);
@@ -44,4 +44,8 @@
     //������������������������������������
     UserBO selectUserInfo(Map<String, Object> parameters);
 
+    //���������������
+    Map<String, Object> loginSmallRoutine(Map<String, Object> parameters);
+
+
 }

--
Gitblit v1.8.0