From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/UserService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/UserService.java b/src/main/java/kr/wisestone/owl/service/UserService.java
index 70af5fa..cefe199 100644
--- a/src/main/java/kr/wisestone/owl/service/UserService.java
+++ b/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);
}
--
Gitblit v1.8.0