resolve conflits
Affichage de
- pom.xml 1 ajout, 1 suppressionpom.xml
- src/main/java/com/marketingconfort/mobiloca/constants/Message.java 3 ajouts, 0 suppression...java/com/marketingconfort/mobiloca/constants/Message.java
- src/main/java/com/marketingconfort/mobiloca/constants/Paths.java 3 ajouts, 1 suppression...n/java/com/marketingconfort/mobiloca/constants/Paths.java
- src/main/java/com/marketingconfort/mobiloca/controller/AgentController.java 3 ajouts, 2 suppressions...marketingconfort/mobiloca/controller/AgentController.java
- src/main/java/com/marketingconfort/mobiloca/dto/request/AgentRequestDTO.java 1 ajout, 1 suppression...arketingconfort/mobiloca/dto/request/AgentRequestDTO.java
- src/main/java/com/marketingconfort/mobiloca/dto/response/AgentResponseDTO.java 4 ajouts, 3 suppressions...ketingconfort/mobiloca/dto/response/AgentResponseDTO.java
- src/main/java/com/marketingconfort/mobiloca/dto/response/RoleDTO.java 15 ajouts, 0 suppression...a/com/marketingconfort/mobiloca/dto/response/RoleDTO.java
- src/main/java/com/marketingconfort/mobiloca/externalService/AgencyService.java 11 ajouts, 2 suppressions...ketingconfort/mobiloca/externalService/AgencyService.java
- src/main/java/com/marketingconfort/mobiloca/externalService/impl/AgencyServiceImpl.java 70 ajouts, 7 suppressions...fort/mobiloca/externalService/impl/AgencyServiceImpl.java
- src/main/java/com/marketingconfort/mobiloca/mapper/AgentMapper.java 8 ajouts, 5 suppressions...ava/com/marketingconfort/mobiloca/mapper/AgentMapper.java
- src/main/java/com/marketingconfort/mobiloca/mapper/RoleMapper.java 22 ajouts, 0 suppression...java/com/marketingconfort/mobiloca/mapper/RoleMapper.java
- src/main/java/com/marketingconfort/mobiloca/repository/AgentRepository.java 1 ajout, 1 suppression...marketingconfort/mobiloca/repository/AgentRepository.java
- src/main/java/com/marketingconfort/mobiloca/repository/ClientRepository.java 3 ajouts, 1 suppression...arketingconfort/mobiloca/repository/ClientRepository.java
- src/main/java/com/marketingconfort/mobiloca/service/AddressService.java 1 ajout, 1 suppression...com/marketingconfort/mobiloca/service/AddressService.java
- src/main/java/com/marketingconfort/mobiloca/service/AgentService.java 2 ajouts, 1 suppression...a/com/marketingconfort/mobiloca/service/AgentService.java
- src/main/java/com/marketingconfort/mobiloca/service/ClientService.java 3 ajouts, 3 suppressions.../com/marketingconfort/mobiloca/service/ClientService.java
- src/main/java/com/marketingconfort/mobiloca/service/impl/AddressServiceImpl.java 2 ajouts, 2 suppressions...tingconfort/mobiloca/service/impl/AddressServiceImpl.java
- src/main/java/com/marketingconfort/mobiloca/service/impl/AgentServiceImpl.java 86 ajouts, 21 suppressions...ketingconfort/mobiloca/service/impl/AgentServiceImpl.java
- src/main/java/com/marketingconfort/mobiloca/service/impl/ClientServiceImpl.java 23 ajouts, 8 suppressions...etingconfort/mobiloca/service/impl/ClientServiceImpl.java
- src/main/java/com/marketingconfort/mobiloca/utils/UserUtils.java 30 ajouts, 0 suppression...n/java/com/marketingconfort/mobiloca/utils/UserUtils.java
Veuillez vous inscrire ou vous se connecter pour commenter