From 2c743103cfa6e24bcb3fd064845c8cfd8fe8bbe6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 14:02:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 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