Resolved conflicts

ohcnetwork · Jan 12, 2025 · cc5e17a · cc5e17a
1 parent 4965b31
commit cc5e17a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/components/Common/Export.tsx b/src/components/Common/Export.tsx
@@ -9,15 +9,15 @@ import { Button } from "@/components/ui/button";
 import useExport from "@/hooks/useExport";
 
 import request from "@/Utils/request/request";
-import { Route } from "@/Utils/request/types";
+import { ApiRoute } from "@/Utils/request/types";
 
 interface ExportButtonProps {
   disabled?: boolean | undefined;
   tooltip?: string | undefined;
   tooltipClassName?: string;
   type?: "csv" | "json";
   action?: Parameters<ReturnType<typeof useExport>["exportFile"]>[0];
-  route?: Route<string | { results: object[] }, unknown>;
+  route?: ApiRoute<string | { results: object[] }, unknown>;
   parse?: (data: string) => string;
   filenamePrefix: string;
   className?: string;
@@ -69,4 +69,3 @@ export const ExportButton = ({
     </>
   );
 };
-tMenu;