충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

 src/main/java/kr/wisestone/owl/service/UserService.java

@@ -50,6 +50,8 @@

    void updateLastProject(Map<String, Object> resJsonData, UserForm userForm);

    void updateLastIssueType(Map<String, Object> resJsonData, UserForm userForm);

    void updateLastMyWorkspace(User user);

    void findProjectMember(Map<String, Object> resJsonData, UserCondition userCondition);
@@ -63,6 +65,8 @@
    User getUserSession(Map<String, Object> resJsonData, HttpServletRequest httpServletRequest);

    List<String> findByReservationNotifyTime();

    List<String> findByRealTimeNotifyTime();

    List<Map<String, Object>> findProjectMember(Project project);

@@ -80,5 +84,7 @@

    void updateLastLogin();

    boolean useUserLevel(Long id);

    //ModelAndView downloadExcelEvent(Model model);
}