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

kaiyu

2021-03-18 333065f8d9b599b048668a0686ba2ee58944b0e4

 screen-api/src/main/java/com/moral/api/mapper/UserMapper.java

@@ -1,9 +1,8 @@
package com.moral.api.mapper;

import java.util.Set;
import java.util.List;
import java.util.Map;

import com.moral.api.entity.Group;
import com.moral.api.entity.Menu;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

@@ -17,7 +16,7 @@
 */
public interface UserMapper extends BaseMapper<User> {

    Set<Group> selectUserGroup(int userId);
    List<Map<String, Object>> selectUsers(Map<String, Object> parameters);

    Set<Menu> selectUserMenu(int userId);
    User selectUserInfo(Map<String, Object> parameters);
}