Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop

# Conflicts:
#	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
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java

@@ -22,10 +22,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.service.IcBuildingService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -54,4 +51,10 @@ public class IcBuildingController {
     public Result<List<OptionResultDTO>> getBuildingOptions(@RequestBody IcBuildingDTO dto) {
         return new Result<List<OptionResultDTO>>().ok(icBuildingService.getBuildingOptions(dto.getNeighborHoodId()));
     }
+
+    @GetMapping("{id}")
+    public Result<IcBuildingDTO> get(@PathVariable("id") String id){
+        IcBuildingDTO data = icBuildingService.get(id);
+        return new Result<IcBuildingDTO>().ok(data);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -21,11 +21,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.result.HouseInfoDTO;
-import com.epmet.dto.result.IcHouseListResultDTO;
-import com.epmet.dto.result.ImportTaskCommonResultDTO;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -25,12 +25,6 @@ import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcHouseEntity;
-import com.epmet.dto.result.*;
-import com.epmet.dto.result.HouseInfoDTO;
-import com.epmet.dto.result.IcHouseListResultDTO;
-import com.epmet.dto.result.ImportTaskCommonResultDTO;
-import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
-import com.epmet.entity.IcHouseEntity;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseTypeEnums;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -529,13 +529,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result updateImage(@RequestBody RentTenantFormDTO formDTO) {
+    public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateImage", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "rentUpdate", formDTO);
     }
 
     @Override
-    public Result<RentTenantDataResultDTO> getRentResiUserInfo(RentTenantDataFormDTO formDTO) {
+    public Result<RentTenantDataResultDTO> tenantData(@RequestBody RentTenantDataFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRentResiUserInfo", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "tenantData", formDTO);
     }
 
     @Override