From f4ab89e7032bea8d3c7e05a44946c3fdb58b7473 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Tue, 27 Sep 2022 11:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java b/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java
index 12dc29d..21a0857 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java
@@ -16,6 +16,6 @@
  */
 public interface GroupMapper extends BaseMapper<Group> {
 
-    List<Map<String, Object>> selectUserGroup(int userId);
+    Map<String, Object> selectUserGroup(Integer userId);
 
 }

--
Gitblit v1.8.0