Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

jinpengyong

2021-04-14 cdf57ef11128f7df6f216c1c717ac783c625fa1b

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

@@ -24,11 +24,11 @@

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

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

    void deleteUser(User user);

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

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