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

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

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

@@ -17,7 +17,7 @@
 */
public interface UserService extends IService<User> {

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

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

@@ -27,4 +27,7 @@

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

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


}