anhvd commit

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

@@ -64,17 +64,14 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-<<<<<<< HEAD
     @RequestMapping(value = "/find-campaign-by-id/{campaignId}", method = RequestMethod.GET)
     public ResponseEntity<ResultDTO> findCampaignById(@PathVariable Long campaignId) {
         ResultDTO resultDTO = campaignService.findCampaignById(campaignId);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 
-=======
     @PostMapping("/changeCampaignStatus")
     public ResultDTO changeCampaignStatus(@RequestBody CampaignDTO dto) {
         return campaignService.changeCampaignStatus(dto);
     }
->>>>>>> 013f98210fde3ae2b1cbd585f96db122812c2a8b
 }