From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-api/src/main/java/com/moral/api/service/UserService.java |    4 ++--
 1 files changed, 2 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..4b11228 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);

--
Gitblit v1.8.0