From 12ee57fe168d76d8a71993a1473dba8b20d49ab9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 09:43:53 +0900
Subject: [PATCH] 이슈(추가,수정)충돌 수정
---
src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java b/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java
index 521b8e3..a7afb29 100644
--- a/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java
+++ b/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java
@@ -14,8 +14,6 @@
ProjectRoleUser findByProjectRoleIdAndUserId(Long projectRoleId, Long userId); //�떞�떦�옄
- ProjectRoleUser findByProjectRoleIdAndDepartmentId(Long projectRoleId, Long departmentId); //�떞�떦遺��꽌
-
void withDrawWorkspaceManagerModifyProjectRole(Workspace workspace, User user);
List<Map<String, Object>> findProjectRoleUser(Map<String, Object> projectRoleUserMap);
--
Gitblit v1.8.0