Merge remote-tracking branch 'origin/master'

src/main/java/com/viettel/campaign/repository/CustomerListRepository.java

 package com.viettel.campaign.repository;
 
 import com.viettel.campaign.model.CustomerList;
-import com.viettel.campaign.web.dto.ResultDTO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -23,6 +22,6 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
     @Query("update CustomerList c set c.status = 0 where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id")
     int deleteCustomerListIds(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
 
-    @Query(value = "SELECT * FROM (SELECT *, MAX(CREATE_AT) OVER() AS LATEST_CREATED FROM CUSTOMER_LIST) WHERE CREATE_AT = LATEST_CREATED", nativeQuery = true)
+    @Query(value = "SELECT * FROM (SELECT c.*, MAX(c.CREATE_AT) OVER() AS LATEST_CREATED FROM CUSTOMER_LIST c) WHERE CREATE_AT = LATEST_CREATED", nativeQuery = true)
     CustomerList latestCreated();
 }

src/main/java/com/viettel/campaign/service/CustomerService.java

@@ -40,8 +40,11 @@ public interface CustomerService {
 
     // ------------ customer contact ------------ //
 
+<<<<<<< HEAD
+=======
     ResultDTO getCustomerContact(CustomerContactDTO customer);
 
+>>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3
     // danh sach khach hang cua chien dich //
 
     ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);

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

@@ -9,6 +9,10 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+<<<<<<< HEAD:src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java
+import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
+=======
+>>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3:src/main/java/com/viettel/campaign/web/rest/CampaignController.java
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;