merge branches

lib/data/services/model/tender_approvals_data/tender_approvals_data.dart

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 // ignore_for_file: invalid_annotation_target
 
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -22,3 +23,29 @@ abstract class TenderApprovalsData with _$TenderApprovalsData {
   factory TenderApprovalsData.fromJson(Map<String, Object?> json) =>
       _$TenderApprovalsDataFromJson(json);
 }
+=======
+// ignore_for_file: invalid_annotation_target
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import '../tender_data/tender_data.dart';
+
+part 'tender_approvals_data.freezed.dart';
+part 'tender_approvals_data.g.dart';
+
+@freezed
+abstract class TenderApprovalsData with _$TenderApprovalsData {
+  const factory TenderApprovalsData({
+    required String? id,
+    required String? status,
+    @JsonKey(name: 'tender_id') required String? tenderId,
+    @JsonKey(name: 'company_id') required String? companyId,
+    @JsonKey(name: 'submission_mode') required String? submissionMode,
+    @JsonKey(name: 'created_at') required int? createdAt,
+    required TenderData? tender,
+  }) = _TenderApprovalsData;
+
+  factory TenderApprovalsData.fromJson(Map<String, Object?> json) =>
+      _$TenderApprovalsDataFromJson(json);
+}
+>>>>>>> tenders_approval