From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/java/com/moral/api/service/GroupService.java |   11 ++++++++++-
 1 files changed, 10 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 56fe317..0548339 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
@@ -1,9 +1,12 @@
 package com.moral.api.service;
 
+import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moral.api.entity.Group;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.entity.User;
 
 /**
  * <p>
@@ -15,6 +18,12 @@
  */
 public interface GroupService extends IService<Group> {
 
-    Map<String, Object> addGroup(Group group, String currentUserId);
+    Map<String, Object> addGroup(Group group, String token);
+
+    void deleteGroup(Group group);
+
+    Map<String, Object> updateGroup(Group group, String token);
+
+    Page<Group> selectGroups(Map<String, Object> parameters);
 
 }

--
Gitblit v1.8.0