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

kaiyu

2021-05-20 e7bc156f901b06e5af54cfe86fe53e7491af7b7f

 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);