Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

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

}