From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 01 12월 2021 13:23:09 +0900 Subject: [PATCH] 충돌 수정 --- src/main/java/kr/wisestone/owl/service/WorkspaceService.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/WorkspaceService.java b/src/main/java/kr/wisestone/owl/service/WorkspaceService.java index e29596d..00d4e28 100644 --- a/src/main/java/kr/wisestone/owl/service/WorkspaceService.java +++ b/src/main/java/kr/wisestone/owl/service/WorkspaceService.java @@ -42,6 +42,8 @@ void checkUseWorkspace(); + Workspace checkUseWorkspace(User user, Long workspaceId); + ModelAndView checkUseExcelDownload(Model model); boolean checkUseTraffic(Long fileSize); -- Gitblit v1.8.0