From 425035bd10ad389a173fce0055149dfec2c882e5 Mon Sep 17 00:00:00 2001 From: KANGYONGSU23 Date: Tue, 28 Nov 2023 09:57:07 +0900 Subject: [PATCH] =?UTF-8?q?fix=20::=20conflict=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/SearchDropDown.tsx | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/components/common/SearchDropDown.tsx b/src/components/common/SearchDropDown.tsx index c66ffdc..7108bf0 100644 --- a/src/components/common/SearchDropDown.tsx +++ b/src/components/common/SearchDropDown.tsx @@ -1,17 +1,10 @@ "use client"; -import { GetCode } from "@/apis/code"; +import { useGetCode } from "@/apis/code"; import { useDropDown } from "@/hook/useDropDown"; import useForm from "@/hook/useForm"; -<<<<<<< HEAD -import Chips from "./Chips"; -import { useGetCode } from "@/apis/code"; -======= -import { - RecruitmentsQueryType -} from "@/hook/useQueryString/type"; +import { RecruitmentsQueryType } from "@/hook/useQueryString/type"; import { useQueryString } from "@/hook/useQueryString/useQueryString"; ->>>>>>> develop import { TechCodeResponensType } from "@/util/type"; import { Icon } from "@team-return/design-system"; import React, { useEffect, useState } from "react"; @@ -70,11 +63,7 @@ function TechCodeDropDownComponent({ techCodeSearch: "", }); -<<<<<<< HEAD - const { data } = useGetCode("TECH", searchKeyword); -======= - const { data:codes } = GetCode("TECH", searchKeyword); ->>>>>>> develop + const { data: codes } = useGetCode("TECH", searchKeyword); useEffect(() => { const techArray = getQueryString("tech_code")