F3.1: registrar merge cronológico de Inventario

api-v3/src/asset-master/asset-master.module.ts

@@ -26,6 +26,8 @@ import { InventoryStructureController } from './inventory-structure.controller';
 import { InventoryStructureService } from './inventory-structure.service';
 import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller';
 import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
+import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
+import { InventoryMergeService } from './inventory-merge.service';
 
 @Module({
   imports: [AuditModule],
@@ -34,6 +36,8 @@ import { InventoryFamilyCatalogService } from './inventory-family-catalog.servic
     AssetsController,
     InventoryStructureController,
     InventoryFamilyCatalogController,
+    InventoryMergeController,
+    FieldInventoryMergeController,
     AssetGeometriesController,
     MapAssetsController,
     AssetHistoryController,
@@ -48,6 +52,7 @@ import { InventoryFamilyCatalogService } from './inventory-family-catalog.servic
     AssetsService,
     InventoryStructureService,
     InventoryFamilyCatalogService,
+    InventoryMergeService,
     AssetGeometriesService,
     AssetHistoryService,
     AssetMediaService,
@@ -60,6 +65,7 @@ import { InventoryFamilyCatalogService } from './inventory-family-catalog.servic
   exports: [
     AssetHistoryService,
     AssetsService,
+    InventoryMergeService,
     AssetGeometriesService,
     AssetMediaService,
     FieldDiscoveryInspectionLinkService,