merge branches

lib/data/services/model/login_data/login_data.g.dart

@@ -7,15 +7,23 @@ part of 'login_data.dart';
 // **************************************************************************
 
 _LoginData _$LoginDataFromJson(Map<String, dynamic> json) => _LoginData(
-  user: User.fromJson(json['user'] as Map<String, dynamic>),
-  accessToken: json['access_token'] as String,
-  refreshToken: json['refresh_token'] as String,
-  expiresAt: (json['expires_at'] as num).toInt(),
+  customer:
+      json['customer'] == null
+          ? null
+          : Customer.fromJson(json['customer'] as Map<String, dynamic>),
+  error:
+      json['error'] == null
+          ? null
+          : ErrorModel.fromJson(json['error'] as Map<String, dynamic>),
+  accessToken: json['access_token'] as String?,
+  refreshToken: json['refresh_token'] as String?,
+  expiresAt: (json['expires_at'] as num?)?.toInt(),
 );
 
 Map<String, dynamic> _$LoginDataToJson(_LoginData instance) =>
     <String, dynamic>{
-      'user': instance.user,
+      'customer': instance.customer,
+      'error': instance.error,
       'access_token': instance.accessToken,
       'refresh_token': instance.refreshToken,
       'expires_at': instance.expiresAt,