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

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

diff --git a/screen-api/src/main/java/com/moral/api/service/GroupService.java b/screen-api/src/main/java/com/moral/api/service/GroupService.java
index cde76b5..627fa61 100644
--- a/screen-api/src/main/java/com/moral/api/service/GroupService.java
+++ b/screen-api/src/main/java/com/moral/api/service/GroupService.java
@@ -31,6 +31,6 @@
     Page<Group> selectGroups(Map<String, Object> parameters);
 
     //���������������������������
-    List<Map<String, Object>> getGroupIds(Integer userId);
+    Map<String, Object> getGroup(Integer userId);
 
 }

--
Gitblit v1.8.0