Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop

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

@@ -128,7 +128,7 @@ public class IcNeighborHoodController {
         formDTO.setOrgType(orgType);
         formDTO.setOrgId(orgId);
         formDTO.setUserId(tokenDTO.getUserId());
-        return new Result().ok(icNeighborHoodService.neighborhoodImport(formDTO,file));
+        return icNeighborHoodService.neighborhoodImport(formDTO,file);
     }
 
 }

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

@@ -192,7 +192,7 @@ public class BuildingServiceImpl implements BuildingService {
             buildingTreeLevelDTO.setId(item.getId());
             buildingTreeLevelDTO.setPId(item.getGridId());
             buildingTreeLevelDTO.setLabel(item.getNeighborHoodName());
-            buildingTreeLevelDTO.setLevel("neighbourHood");
+            buildingTreeLevelDTO.setLevel("neighborHood");
             buildingTreeLevelDTO.setLongitude(item.getLongitude());
             buildingTreeLevelDTO.setLatitude(item.getLatitude());
             buildingTreeLevelDTO.setChildren(new ArrayList<>());