# Conflicts:
#	src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerListRepository.java
#	src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepository.java
#	src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
#	src/main/java/com/viettel/campaign/web/rest/CustomerController.java