fix(FE): resolve merge conflict

2026-05-26 00:05:45 +00:00 · 2025-11-21 09:45:40 +07:00
parent 23ab4b15e1 e69e5da2c3
commit 70521330e4
35 changed files with 7095 additions and 3466 deletions
@@ -0,0 +1,11 @@
+import { BaseApiService } from '@/services/api/base';
+import {
+  BaseProjectFlockKandang,
+  ProjectFlockKandang,
+} from '@/types/api/production/project-flock-kandang';
+
+export const ProjectFlockKandangApi = new BaseApiService<
+  BaseProjectFlockKandang,
+  ProjectFlockKandang,
+  unknown
+>('project-flock-kandang');