merge code

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

@@ -34,7 +34,7 @@ public interface CustomerService {
 
     ResultDTO getAllCustomerList(int page, int pageSize, String sort, Long companySiteId);
 
-    ResultDTO createCustomerList(CustomerListDTO customerListDTO, String userName);
+    CustomerList createCustomerList(CustomerListDTO customerListDTO, String userName);
 
     ResultDTO updateCustomerList(CustomerListDTO customerListDTO);
 

src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

@@ -598,7 +598,7 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO createCustomerList(CustomerListDTO customerListDTO, String userName) {
+    public CustomerList createCustomerList(CustomerListDTO customerListDTO, String userName) {
         ResultDTO resultDTO = new ResultDTO();
         CustomerListMapper customerListMapper = new CustomerListMapper();
         CustomerList customerList = new CustomerList();
@@ -627,7 +627,7 @@ public class CustomerServiceImpl implements CustomerService {
             e.printStackTrace();
         }
 
-        return resultDTO;
+        return customerList;
     }
 
     @Override