Skip to content

Commit

Permalink
fix: BriefingQueryAdapter import 구문 에러 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
swa07016 committed Jul 21, 2024
1 parent 10d403e commit bf90d74
Showing 1 changed file with 1 addition and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<<<<<<<< HEAD:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryAdapter.java
package com.example.briefingapi.briefing.implement.service;
========
package briefing.briefing.application.service;
>>>>>>>> release:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryService.java

import java.util.List;

Expand All @@ -14,24 +10,10 @@
import com.example.briefingcommon.common.exception.common.ErrorCode;
import com.example.briefingcommon.entity.Briefing;
import com.example.briefingcommon.entity.enums.APIVersion;
import org.springframework.stereotype.Service;
<<<<<<<< HEAD:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryAdapter.java
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

@Adapter
========

import briefing.briefing.application.context.BriefingQueryContext;
import briefing.briefing.application.context.BriefingQueryContextFactory;
import briefing.briefing.application.dto.BriefingRequestParam;
import briefing.briefing.domain.Briefing;
import briefing.common.enums.APIVersion;
import briefing.exception.ErrorCode;
import briefing.exception.handler.BriefingException;
import lombok.RequiredArgsConstructor;

@Service
>>>>>>>> release:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryService.java
@RequiredArgsConstructor
public class BriefingQueryAdapter {

Expand Down

0 comments on commit bf90d74

Please sign in to comment.