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/ApiTokenService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/ApiTokenService.java b/src/main/java/kr/wisestone/owl/service/ApiTokenService.java
index d1d58e3..8758fec 100644
--- a/src/main/java/kr/wisestone/owl/service/ApiTokenService.java
+++ b/src/main/java/kr/wisestone/owl/service/ApiTokenService.java
@@ -1,12 +1,10 @@
 package kr.wisestone.owl.service;
 
-import kr.wisestone.owl.domain.ApiToken;
-import kr.wisestone.owl.domain.CompanyField;
-import kr.wisestone.owl.domain.CustomField;
-import kr.wisestone.owl.domain.Event;
+import kr.wisestone.owl.domain.*;
 import kr.wisestone.owl.vo.ApiTokenVo;
 import kr.wisestone.owl.vo.CompanyFieldVo;
 import kr.wisestone.owl.vo.EventVo;
+import kr.wisestone.owl.vo.UserVo;
 import kr.wisestone.owl.web.condition.ApiTokenCondition;
 import kr.wisestone.owl.web.condition.CompanyFieldCondition;
 import kr.wisestone.owl.web.condition.EventCondition;
@@ -30,5 +28,7 @@
 
     ApiTokenVo find();
 
+    UserVo certification(String token);
+
     void remove(ApiTokenForm apiTokenForm);
 }

--
Gitblit v1.8.0