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

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

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

@@ -5,6 +5,7 @@

import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.UserBo;

/**
 * <p>
@@ -17,4 +18,8 @@
public interface UserMapper extends BaseMapper<User> {

    List<Map<String, Object>> selectUsers(Map<String, Object> parameters);

    UserBo selectUserInfo(Map<String, Object> parameters);

    User selectUser(Map<String, Object> parameters);
}