# Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java