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

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 screen-api/src/main/java/com/moral/api/service/GroupService.java

@@ -1,5 +1,7 @@
package com.moral.api.service;

import java.util.Map;

import com.moral.api.entity.Group;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -13,4 +15,6 @@
 */
public interface GroupService extends IService<Group> {

    Map<String, Object> addGroup(Group group, String currentUserId);

}