From 1dad4d94cc415d2f8092aff0368744289337f504 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 화, 22 2월 2022 14:29:43 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 c36d4f1..ca9922e 100644
--- a/src/main/java/kr/wisestone/owl/service/UserService.java
+++ b/src/main/java/kr/wisestone/owl/service/UserService.java
@@ -32,6 +32,8 @@
void detailUser(Map<String, Object> resJsonData, UserCondition userCondition);
+ void findMyLevelAndDepartment(Map<String, Object> resJsonData);
+
void modifyUser(UserForm userForm, MultipartFile profile);
void modifyPassword(UserForm userForm);
@@ -50,6 +52,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);
@@ -64,6 +68,8 @@
List<String> findByReservationNotifyTime();
+ List<String> findByRealTimeNotifyTime();
+
List<Map<String, Object>> findProjectMember(Project project);
void updateLanguage(String language);
--
Gitblit v1.8.0