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/repository/ProjectRoleUserRepository.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/repository/ProjectRoleUserRepository.java b/src/main/java/kr/wisestone/owl/repository/ProjectRoleUserRepository.java
index acec2ae..0835a56 100644
--- a/src/main/java/kr/wisestone/owl/repository/ProjectRoleUserRepository.java
+++ b/src/main/java/kr/wisestone/owl/repository/ProjectRoleUserRepository.java
@@ -11,6 +11,6 @@
ProjectRoleUser findByProjectRoleIdAndUserId(@Param("projectRoleId") Long projectRoleId, @Param("userId") Long userId);
- ProjectRoleUser findByProjectRoleIdAndDepartmentId(@Param("projectRoleId") Long projectRoleId, @Param("departmentId") Long departmentId);
+ //ProjectRoleUser findByProjectRoleIdAndDepartmentId(@Param("projectRoleId") Long projectRoleId, @Param("departmentId") Long departmentId);
}
--
Gitblit v1.8.0