# Conflicts: # src/main/java/com/huiju/estateagents/config/FadadaProperties.java # src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java # src/main/resources/application-blue.yml # src/main/resources/application-green.yml