Merge branch 'master' of https://git.myitsol.com/hanv/service-campaign

# Conflicts:
#	src/main/java/com/viettel/campaign/repository/impl/CampaignRepositoryImpl.java
#	src/main/java/com/viettel/campaign/web/dto/request_dto/CampaignRequestDTO.java

src/main/java/com/viettel/campaign/model/CustomerContact.java

+package com.viettel.campaign.model;
+
+public class CustomerContact {
+}

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

+package com.viettel.campaign.repository;
+
+public class CustomerContactRepository {
+}

src/main/java/com/viettel/campaign/web/dto/CustomerContactDTO.java

+package com.viettel.campaign.web.dto;
+
+public class CustomerContactDTO {
+}