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

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

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

@@ -21,6 +21,8 @@

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

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

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

    void deleteUser(User user);