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

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

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

@@ -1,11 +1,13 @@
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.User;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.UserBo;

/**
 * <p>
@@ -19,12 +21,16 @@

    Map<String, Object> login(Map<String, Object> parameters);

    Map<String, Object> getMenus(Map<String, Object> parameters);

    Map<String, Object> addUser(User user, String token);

    Map<String, Object> deleteUser(int userId, String token);
    void deleteUser(User user);

    Map<String, Object> updateUser(User user, String token);

    Map<String, Object> getUsers(Map<String, Object> parameters);
    Page<User> selectUsers(Map<String, Object> parameters);

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

}