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

chen_xi

2022-11-17 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a

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

@@ -1,11 +1,10 @@
package com.moral.api.mapper;

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

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

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

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

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

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