Skip to content

S
service-campaign
Commit d49770c8 authored by ='s avatar =
Browse files
Options

hungtt

parent 16984cf3
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java
View file @ d49770c8
...@@ -2,11 +2,7 @@ package com.viettel.campaign.web.rest.controller; ...@@ -2,11 +2,7 @@ package com.viettel.campaign.web.rest.controller;
import com.viettel.campaign.service.CampaignExecuteService; import com.viettel.campaign.service.CampaignExecuteService;
import com.viettel.campaign.service.CampaignService; import com.viettel.campaign.service.CampaignService;
<<<<<<< HEAD
import com.viettel.campaign.web.dto.ContactCustResultDTO;
=======
import com.viettel.campaign.web.dto.CampaignDTO; import com.viettel.campaign.web.dto.CampaignDTO;
>>>>>>> 1877e2709aa93ae5ac71159f8d3c290d0f90981a
import com.viettel.campaign.web.dto.ResultDTO; import com.viettel.campaign.web.dto.ResultDTO;
import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO; import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -16,8 +12,6 @@ import org.springframework.http.HttpStatus; ...@@ -16,8 +12,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
@RestController @RestController
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment