merge branches

lib/data/services/model/tender_approvals_response/tender_approvals_response.dart

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 // ignore_for_file: invalid_annotation_target
 
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -20,3 +21,27 @@ abstract class TenderApprovalsResponse with _$TenderApprovalsResponse {
   factory TenderApprovalsResponse.fromJson(Map<String, Object?> json) =>
       _$TenderApprovalsResponseFromJson(json);
 }
+=======
+// ignore_for_file: invalid_annotation_target
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import '../error/error_model.dart';
+import '../tender_approvals_data/tender_approvals_data.dart';
+
+part 'tender_approvals_response.freezed.dart';
+part 'tender_approvals_response.g.dart';
+
+@freezed
+abstract class TenderApprovalsResponse with _$TenderApprovalsResponse {
+  const factory TenderApprovalsResponse({
+    required String? message,
+    required bool? success,
+    required ErrorModel? error,
+    required List<TenderApprovalsData>? data,
+  }) = _TenderApprovalsResponse;
+
+  factory TenderApprovalsResponse.fromJson(Map<String, Object?> json) =>
+      _$TenderApprovalsResponseFromJson(json);
+}
+>>>>>>> tenders_approval