fix(FE-33): fix conflict git

src/services/api/master-data.ts

@@ -29,11 +29,36 @@ import {
   Customer,
   UpdateCustomerPayload,
 } from '@/types/api/master-data/customer';
+import {
+  CreateProductCategoryPayload,
+  ProductCategory,
+  UpdateProductCategoryPayload,
+} from '@/types/api/master-data/product-category';
+import {
+  CreateProductPayload,
+  Product,
+  UpdateProductPayload,
+} from '@/types/api/master-data/product';
 import {
   CreateSupplierPayload,
   Supplier,
   UpdateSupplierPayload,
 } from '@/types/api/master-data/supplier';
+import {
+  CreateNonstockPayload,
+  Nonstock,
+  UpdateNonstockPayload,
+} from '@/types/api/master-data/nonstock';
+import {
+  Bank,
+  CreateBankPayload,
+  UpdateBankPayload,
+} from '@/types/api/master-data/bank';
+import {
+  CreateFcrPayload,
+  Fcr,
+  UpdateFcrPayload,
+} from '@/types/api/master-data/fcr';
 
 export const UomApi = new BaseApiService<
   Uom,
@@ -70,9 +95,38 @@ export const CustomerApi = new BaseApiService<
   CreateCustomerPayload,
   UpdateCustomerPayload
 >('/master-data/customers');
+export const ProductCategoryApi = new BaseApiService<
+  ProductCategory,
+  CreateProductCategoryPayload,
+  UpdateProductCategoryPayload
+>('/master-data/product-categories');
+
+export const ProductApi = new BaseApiService<
+  Product,
+  CreateProductPayload,
+  UpdateProductPayload
+>('/master-data/products');
 
 export const SupplierApi = new BaseApiService<
   Supplier,
   CreateSupplierPayload,
   UpdateSupplierPayload
->('/master-data/suppliers');
+>('/master-data/suppliers');
+
+export const NonstockApi = new BaseApiService<
+  Nonstock,
+  CreateNonstockPayload,
+  UpdateNonstockPayload
+>('/master-data/nonstocks');
+
+export const BankApi = new BaseApiService<
+  Bank,
+  CreateBankPayload,
+  UpdateBankPayload
+>('/master-data/banks');
+
+export const FcrApi = new BaseApiService<
+  Fcr,
+  CreateFcrPayload,
+  UpdateFcrPayload
+>('/master-data/fcrs');