hungtt-commit conflict campaignController

src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java

@@ -9,18 +9,13 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-<<<<<<< HEAD
-import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
-=======
 import org.springframework.http.HttpHeaders;
->>>>>>> 55a6b806b604aa92fca10c101776df185d0d67af
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -37,14 +32,10 @@ public class CampaignController {
     @Autowired
     CampaignService campaignService;
 
-<<<<<<< HEAD
-    @PostMapping("/searchCampaignExecute")
-=======
     @Autowired
     CampaignExecuteService campaignExecuteService;
 
     @RequestMapping("/searchCampaignExecute")
->>>>>>> 55a6b806b604aa92fca10c101776df185d0d67af
     @ResponseBody
     public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
         ResultDTO result = campaignService.searchCampaignExecute(requestDto);
@@ -74,14 +65,12 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-<<<<<<< HEAD
     @GetMapping("/findByCampaignId")
     @ResponseBody
     public ResponseEntity findByCampaignId(@RequestParam("campaignId") Long campaignId) {
         ResultDTO result = campaignService.findByCampaignId(campaignId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
-=======
     @PostMapping("/searchInteractiveResult")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchInteractiveResult(@RequestBody CampaignRequestDTO dto) throws Exception {
@@ -126,5 +115,4 @@ public class CampaignController {
         dto.setSessionId(request.getSession().getId());
         return campaignService.changeCampaignStatus(dto);
     }
->>>>>>> 55a6b806b604aa92fca10c101776df185d0d67af
 }