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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java

@@ -48,6 +48,7 @@ public class IcHouseDTO implements Serializable {
      * 小区id
      */
 	private String neighborHoodId;
+    private String neighborHoodName;
 
     /**
      * 片区id，neighbor_hood_part.id,可为空。

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

@@ -95,9 +95,11 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         HouseInfoDTO houseInfo = icHouseRedis.getHouseInfo(id, dto.getCustomerId());
         if (null != houseInfo) {
-            dto.setBuildingName(houseInfo.getNeighborHoodName().concat(houseInfo.getBuildingName()));
+            dto.setNeighborHoodName(houseInfo.getNeighborHoodName());
+            dto.setBuildingName(houseInfo.getBuildingName());
             dto.setUnitName(houseInfo.getUnitName());
         } else {
+            dto.setNeighborHoodName(StrConstant.EPMETY_STR);
             dto.setBuildingName(StrConstant.EPMETY_STR);
             dto.setUnitName(StrConstant.EPMETY_STR);
         }