1.FCM的初始化与工具类。

2.FCM的token管理，注册与登出接口调试
3.消息类型的判断与页面跳转

app/android/app/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id "kotlin-android"
     id "kotlin-kapt"
     id "dev.flutter.flutter-gradle-plugin"
+    id 'com.google.gms.google-services'
 }
 
 def keystoreProperties = new Properties()
@@ -134,4 +135,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'  //加入AndroidX依赖
     implementation 'com.android.support:multidex:1.0.3'
 //    implementation 'androidx.core:core-splashscreen:1.0.0' //启动12兼容
-}
+}
+
+apply plugin: 'com.google.gms.google-services'

app/android/app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "826534850691",
+    "project_id": "ifm-21739",
+    "storage_bucket": "ifm-21739.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:826534850691:android:d7780551ab203907262bb6",
+        "android_client_info": {
+          "package_name": "com.hongyegroup.app24ifm"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7dHuJPzIfte7SHkKeeflzijLd33iRvt0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/android/settings.gradle

@@ -25,6 +25,9 @@ plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.7.3" apply false
     id "org.jetbrains.kotlin.android" version "1.9.0" apply false
+
+    // 添加 Google Services 插件
+    id "com.google.gms.google-services" version "4.4.0" apply false
 }
 
 include ":app"

app/lib/firebase_options.dart

@@ -0,0 +1,58 @@
+// Copyright 2022, the Chromium project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// File generated by FlutterFire CLI.
+// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class MyFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      default:
+        throw UnsupportedError(
+          'MyFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyB7dHuJPzIfte7SHkKeeflzijLd33iRvt0',
+    appId: '1:826534850691:android:d7780551ab203907262bb6',
+    messagingSenderId: '826534850691',
+    projectId: 'ifm-21739',
+    storageBucket: 'ifm-21739.firebasestorage.app'
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyDooSUGSf63Ghq02_iIhtnmwMDs4HlWS6c',
+    appId: '1:406099696497:ios:acd9c8e17b5e620e3574d0',
+    messagingSenderId: '406099696497',
+    projectId: 'flutterfire-e2e-tests',
+    databaseURL:
+        'https://flutterfire-e2e-tests-default-rtdb.europe-west1.firebasedatabase.app',
+    storageBucket: 'flutterfire-e2e-tests.appspot.com',
+    androidClientId:
+        '406099696497-tvtvuiqogct1gs1s6lh114jeps7hpjm5.apps.googleusercontent.com',
+    iosClientId:
+        '406099696497-taeapvle10rf355ljcvq5dt134mkghmp.apps.googleusercontent.com',
+    iosBundleId: 'io.flutter.plugins.firebase.tests',
+  );
+
+}

app/lib/main.dart

@@ -25,6 +25,7 @@ import 'package:widgets/dialog/custom_success_widget.dart';
 import 'package:widgets/dialog/custom_loading_widget.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:cs_resources/theme/theme_config.dart';
+import 'firebase_options.dart';
 import 'router/page/app_page_router.dart';
 import 'router/component/app_service_provider.dart';
 import 'package:cpt_auth/router/component/auth_component_service.dart';
@@ -36,11 +37,15 @@ import 'package:cpt_payment/router/component/payment_component_service.dart';
 import 'package:cpt_property/router/component/property_component_service.dart';
 import 'package:cpt_rewards/router/component/rewards_component_service.dart';
 import 'package:cpt_services/router/component/services_component_service.dart';
+import 'package:firebase_core/firebase_core.dart';
 
 void main() async {
   //交给初始化构造器去统一初始化
   await AppInitializer.initializeRunalone();
 
+  //初始化FCM
+  Firebase.initializeApp(name: '24IFM', options: MyFirebaseOptions.currentPlatform);
+
   //组件路由的注入
   ComponentServiceManager()
     ..addServiceProvider(mainServiceProvider)

packages/cpt_form/lib/modules/detail/detail_not_approved_fragment.dart

@@ -70,7 +70,7 @@ class DetailNotApprovedFragment extends HookConsumerWidget {
                       style: TextStyle(fontSize: 15, fontWeight: FontWeight.w400, color: context.appColors.textBlack),
                       children: <TextSpan>[
                         TextSpan(
-                          text: S.current.approved_on_sometime(' '),
+                          text: S.current.not_approved_on_sometime(' '),
                         ),
                         TextSpan(
                           text: state.forDetail?.updateAt ?? "-",

packages/cpt_main/lib/modules/main/main_view_model.dart

@@ -1,17 +1,23 @@
+import 'package:domain/repository/auth_repository.dart';
 import 'package:plugin_basic/constants/app_constant.dart';
 import 'package:plugin_basic/provider/user_config/user_config_service.dart';
+import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:plugin_platform/http/dio/dio_cancelable_mixin.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared/utils/event_bus.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'main_state.dart';
+import 'package:plugin_basic/fcm/fcm_utils.dart';
 
 part 'main_view_model.g.dart';
 
 @riverpod
 class MainViewModel extends _$MainViewModel with DioCancelableMixin {
+  late final AuthRepository _authRepository;
+
   @override
   MainState build() {
+    _authRepository = ref.read(authRepositoryProvider);
     final state = MainState();
 
     registerEventBus();
@@ -19,6 +25,7 @@ class MainViewModel extends _$MainViewModel with DioCancelableMixin {
       unregisterEventBus();
     });
 
+    _registerFCM();
     return state;
   }
 
@@ -41,4 +48,23 @@ class MainViewModel extends _$MainViewModel with DioCancelableMixin {
     bus.off(AppConstant.eventProfileRefresh, subscribe);
   }
 
+  void _registerFCM() {
+    //获取token,并初始化监听
+    FcmUtils().initNotifications(onToken: (fcmToken) {
+      Log.d("准备注册FCM Token :$fcmToken");
+      _doRegisterFCM(fcmToken);
+    });
+  }
+
+  /// 调用接口注册FCM
+  void _doRegisterFCM(String fcmToken) async {
+    final result = await _authRepository.registerFCMToken(fcmToken: fcmToken, cancelToken: cancelToken);
+
+    //请求成功去首页
+    if (result.isSuccess) {
+      Log.d("注册 FMC Token 成功！");
+    } else {
+      ToastEngine.show(result.errorMsg ?? "UnKnow Error");
+    }
+  }
 }

packages/cpt_profile/lib/modules/setting/setting_view_model.dart

@@ -3,11 +3,13 @@ import 'package:cpt_profile/modules/reset_password/reset_password_page.dart';
 import 'package:cpt_profile/modules/setting/dialog/account_deactivation_dialog.dart';
 import 'package:cpt_profile/modules/setting/setting_state.dart';
 import 'package:cs_resources/generated/l10n.dart';
+import 'package:domain/repository/auth_repository.dart';
 import 'package:plugin_basic/constants/app_constant.dart';
 import 'package:plugin_basic/provider/user_config/user_config_service.dart';
 import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
 import 'package:plugin_platform/engine/sp/sp_util.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
+import 'package:plugin_platform/http/dio/dio_cancelable_mixin.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:router/componentRouter/component_service_manager.dart';
 import 'package:shared/utils/event_bus.dart';
@@ -16,10 +18,13 @@ import 'package:widgets/dialog/app_default_dialog.dart';
 part 'setting_view_model.g.dart';
 
 @riverpod
-class SettingViewModel extends _$SettingViewModel {
+class SettingViewModel extends _$SettingViewModel with DioCancelableMixin{
+  late final AuthRepository _authRepository;
+
   @override
   SettingState build() {
-    return SettingState();
+    _authRepository = ref.read(authRepositoryProvider);
+    return const SettingState();
   }
 
   void changeEnableNotification(bool value) {
@@ -41,19 +46,31 @@ class SettingViewModel extends _$SettingViewModel {
         widget: AppDefaultDialog(
       message: S.current.logout_alert,
       confirmAction: () {
-        //清除用户登录信息
-        UserConfigService.getInstance().handleLogoutParams();
-        // 清除 garagesale category 缓存
-        SPUtil.remove(AppConstant.storageGarageCategoryList);
-        // 清除 servives category 缓存
-        SPUtil.remove(AppConstant.storagePaidServiceCategoryList);
-        SPUtil.remove(AppConstant.storageRepairServiceCategoryList);
-        //清除全部页面栈去登录页面
-        ComponentServiceManager().authService.startAndPopAllLoginPage();
+        _requestLogout();
       },
     ));
   }
 
+  /// 调用接口注册FCM
+  void _requestLogout() async {
+    final result = await _authRepository.authLogout(cancelToken: cancelToken);
+
+    //请求成功去首页
+    if (result.isSuccess) {
+      //清除用户登录信息
+      UserConfigService.getInstance().handleLogoutParams();
+      // 清除 garagesale category 缓存
+      SPUtil.remove(AppConstant.storageGarageCategoryList);
+      // 清除 servives category 缓存
+      SPUtil.remove(AppConstant.storagePaidServiceCategoryList);
+      SPUtil.remove(AppConstant.storageRepairServiceCategoryList);
+      //清除全部页面栈去登录页面
+      ComponentServiceManager().authService.startAndPopAllLoginPage();
+    } else {
+      ToastEngine.show(result.errorMsg ?? "UnKnow Error");
+    }
+  }
+
   //删除账号的提示弹窗
   void doDeleteAccount() {
     DialogEngine.show(widget: AccountDeactivationDialog(
@@ -72,5 +89,4 @@ class SettingViewModel extends _$SettingViewModel {
   void rateUs() {
     bus.emit(AppConstant.eventProfileRefresh, true);
   }
-
 }

packages/cs_domain/lib/constants/api_constants.dart

@@ -28,11 +28,14 @@ class ApiConstants {
   static const apiSendSMS = "/api/v1/user/sms/send";
 
   // 登出系统
-  static const apiUserLogout = "/index.php/api/v1/hotel/logout";
+  static const apiUserLogout = "/api/v1/user/auth/logout";
 
   //用户注销
   static const apiAuthDeactivate = "/index.php/api/v1/hotel/deactivate";
 
+  //注册Token
+  static const apiFCMToken = "/api/v1/user/auth/fcm-token";
+
   // =========================== 首页 ↓=========================================
 
   //反馈的分类列表

packages/cs_domain/lib/entity/form_detail_entity.dart

@@ -13,7 +13,7 @@ class FormDetailEntity {
 	int status = 0;  //0-已提交未审核，1-已审核通过，2-审核失败
 	@JSONField(name: "created_at")
 	String? createdAt;
-	@JSONField(name: "update_at")
+	@JSONField(name: "updated_at")
 	String? updateAt;
 	FormOrder? order;
 

packages/cs_domain/lib/generated/json/facility_book_entity.g.dart

@@ -7,22 +7,16 @@ FacilityBookEntity $FacilityBookEntityFromJson(Map<String, dynamic> json) {
   if (remainQuota != null) {
     facilityBookEntity.remainQuota = remainQuota;
   }
-  final String? quotaResetOn = jsonConvert.convert<String>(
-      json['quota_reset_on']);
+  final String? quotaResetOn = jsonConvert.convert<String>(json['quota_reset_on']);
   if (quotaResetOn != null) {
     facilityBookEntity.quotaResetOn = quotaResetOn;
   }
-  final FacilityBookFacilityType? facilityType = jsonConvert.convert<
-      FacilityBookFacilityType>(json['facility_type']);
+  final FacilityBookFacilityType? facilityType = jsonConvert.convert<FacilityBookFacilityType>(json['facility_type']);
   if (facilityType != null) {
     facilityBookEntity.facilityType = facilityType;
   }
-  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities)
-      .toList();
+  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities).toList();
   if (facilities != null) {
     facilityBookEntity.facilities = facilities;
   }
@@ -53,11 +47,9 @@ extension FacilityBookEntityExtension on FacilityBookEntity {
   }
 }
 
-FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(
-    Map<String, dynamic> json) {
+FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(Map<String, dynamic> json) {
   final FacilityBookFacilityType facilityBookFacilityType = FacilityBookFacilityType();
-  final int? bookAdvanceDays = jsonConvert.convert<int>(
-      json['book_advance_days']);
+  final int? bookAdvanceDays = jsonConvert.convert<int>(json['book_advance_days']);
   if (bookAdvanceDays != null) {
     facilityBookFacilityType.bookAdvanceDays = bookAdvanceDays;
   }
@@ -65,16 +57,14 @@ FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(
   if (quota != null) {
     facilityBookFacilityType.quota = quota;
   }
-  final String? quotaResetType = jsonConvert.convert<String>(
-      json['quota_reset_type']);
+  final String? quotaResetType = jsonConvert.convert<String>(json['quota_reset_type']);
   if (quotaResetType != null) {
     facilityBookFacilityType.quotaResetType = quotaResetType;
   }
   return facilityBookFacilityType;
 }
 
-Map<String, dynamic> $FacilityBookFacilityTypeToJson(
-    FacilityBookFacilityType entity) {
+Map<String, dynamic> $FacilityBookFacilityTypeToJson(FacilityBookFacilityType entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['book_advance_days'] = entity.bookAdvanceDays;
   data['quota'] = entity.quota;
@@ -95,8 +85,7 @@ extension FacilityBookFacilityTypeExtension on FacilityBookFacilityType {
   }
 }
 
-FacilityBookFacilities $FacilityBookFacilitiesFromJson(
-    Map<String, dynamic> json) {
+FacilityBookFacilities $FacilityBookFacilitiesFromJson(Map<String, dynamic> json) {
   final FacilityBookFacilities facilityBookFacilities = FacilityBookFacilities();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -106,19 +95,15 @@ FacilityBookFacilities $FacilityBookFacilitiesFromJson(
   if (name != null) {
     facilityBookFacilities.name = name;
   }
-  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<FacilityBookFacilitiesPeriods>(
-          e) as FacilityBookFacilitiesPeriods).toList();
+  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FacilityBookFacilitiesPeriods>(e) as FacilityBookFacilitiesPeriods).toList();
   if (periods != null) {
     facilityBookFacilities.periods = periods;
   }
   return facilityBookFacilities;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesToJson(
-    FacilityBookFacilities entity) {
+Map<String, dynamic> $FacilityBookFacilitiesToJson(FacilityBookFacilities entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -139,8 +124,7 @@ extension FacilityBookFacilitiesExtension on FacilityBookFacilities {
   }
 }
 
-FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(
-    Map<String, dynamic> json) {
+FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(Map<String, dynamic> json) {
   final FacilityBookFacilitiesPeriods facilityBookFacilitiesPeriods = FacilityBookFacilitiesPeriods();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -173,8 +157,7 @@ FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(
   return facilityBookFacilitiesPeriods;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(
-    FacilityBookFacilitiesPeriods entity) {
+Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(FacilityBookFacilitiesPeriods entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['start'] = entity.start;

packages/cs_domain/lib/generated/json/facility_index_entity.g.dart

@@ -15,10 +15,8 @@ FacilityIndexEntity $FacilityIndexEntityFromJson(Map<String, dynamic> json) {
   if (name != null) {
     facilityIndexEntity.name = name;
   }
-  final List<String>? mapResources = (json['map_resources'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<String>(e) as String)
-      .toList();
+  final List<String>? mapResources = (json['map_resources'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<String>(e) as String).toList();
   if (mapResources != null) {
     facilityIndexEntity.mapResources = mapResources;
   }

packages/cs_domain/lib/generated/json/facility_page_entity.g.dart

@@ -21,15 +21,12 @@ FacilityPageEntity $FacilityPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     facilityPageEntity.countPage = countPage;
   }
-  final String? totalDeposit = jsonConvert.convert<String>(
-      json['total_deposit']);
+  final String? totalDeposit = jsonConvert.convert<String>(json['total_deposit']);
   if (totalDeposit != null) {
     facilityPageEntity.totalDeposit = totalDeposit;
   }
-  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail)
-      .toList();
+  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail).toList();
   if (list != null) {
     facilityPageEntity.list = list;
   }
@@ -68,28 +65,23 @@ extension FacilityPageEntityExtension on FacilityPageEntity {
 
 FacilityDetail $FacilityDetailFromJson(Map<String, dynamic> json) {
   final FacilityDetail facilityDetail = FacilityDetail();
-  final FacilityPageListBooking? booking = jsonConvert.convert<
-      FacilityPageListBooking>(json['booking']);
+  final FacilityPageListBooking? booking = jsonConvert.convert<FacilityPageListBooking>(json['booking']);
   if (booking != null) {
     facilityDetail.booking = booking;
   }
-  final FacilityPageListFacility? facility = jsonConvert.convert<
-      FacilityPageListFacility>(json['facility']);
+  final FacilityPageListFacility? facility = jsonConvert.convert<FacilityPageListFacility>(json['facility']);
   if (facility != null) {
     facilityDetail.facility = facility;
   }
-  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<
-      FacilityPageListTimePeriod>(json['time_period']);
+  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<FacilityPageListTimePeriod>(json['time_period']);
   if (timePeriod != null) {
     facilityDetail.timePeriod = timePeriod;
   }
-  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(
-      json['account']);
+  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(json['account']);
   if (account != null) {
     facilityDetail.account = account;
   }
-  final FacilityOrder? order = jsonConvert.convert<FacilityOrder>(
-      json['order']);
+  final FacilityOrder? order = jsonConvert.convert<FacilityOrder>(json['order']);
   if (order != null) {
     facilityDetail.order = order;
   }
@@ -123,8 +115,7 @@ extension FacilityDetailExtension on FacilityDetail {
   }
 }
 
-FacilityPageListBooking $FacilityPageListBookingFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> json) {
   final FacilityPageListBooking facilityPageListBooking = FacilityPageListBooking();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -146,21 +137,18 @@ FacilityPageListBooking $FacilityPageListBookingFromJson(
   if (deposit != null) {
     facilityPageListBooking.deposit = deposit;
   }
-  final String? depositRefund = jsonConvert.convert<String>(
-      json['deposit_refund']);
+  final String? depositRefund = jsonConvert.convert<String>(json['deposit_refund']);
   if (depositRefund != null) {
     facilityPageListBooking.depositRefund = depositRefund;
   }
-  final String? depositRefundAt = jsonConvert.convert<String>(
-      json['deposit_refund_at']);
+  final String? depositRefundAt = jsonConvert.convert<String>(json['deposit_refund_at']);
   if (depositRefundAt != null) {
     facilityPageListBooking.depositRefundAt = depositRefundAt;
   }
   return facilityPageListBooking;
 }
 
-Map<String, dynamic> $FacilityPageListBookingToJson(
-    FacilityPageListBooking entity) {
+Map<String, dynamic> $FacilityPageListBookingToJson(FacilityPageListBooking entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['date'] = entity.date;
@@ -193,8 +181,7 @@ extension FacilityPageListBookingExtension on FacilityPageListBooking {
   }
 }
 
-FacilityPageListFacility $FacilityPageListFacilityFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListFacility $FacilityPageListFacilityFromJson(Map<String, dynamic> json) {
   final FacilityPageListFacility facilityPageListFacility = FacilityPageListFacility();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -211,8 +198,7 @@ FacilityPageListFacility $FacilityPageListFacilityFromJson(
   return facilityPageListFacility;
 }
 
-Map<String, dynamic> $FacilityPageListFacilityToJson(
-    FacilityPageListFacility entity) {
+Map<String, dynamic> $FacilityPageListFacilityToJson(FacilityPageListFacility entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -233,8 +219,7 @@ extension FacilityPageListFacilityExtension on FacilityPageListFacility {
   }
 }
 
-FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(Map<String, dynamic> json) {
   final FacilityPageListTimePeriod facilityPageListTimePeriod = FacilityPageListTimePeriod();
   final String? price = jsonConvert.convert<String>(json['price']);
   if (price != null) {
@@ -247,8 +232,7 @@ FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(
   return facilityPageListTimePeriod;
 }
 
-Map<String, dynamic> $FacilityPageListTimePeriodToJson(
-    FacilityPageListTimePeriod entity) {
+Map<String, dynamic> $FacilityPageListTimePeriodToJson(FacilityPageListTimePeriod entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['price'] = entity.price;
   data['deposit'] = entity.deposit;
@@ -280,8 +264,7 @@ FacilityOrder $FacilityOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     facilityOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(
-      json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
   if (depositAmount != null) {
     facilityOrder.depositAmount = depositAmount;
   }

packages/cs_domain/lib/generated/json/feedback_detail_entity.g.dart

@@ -30,17 +30,12 @@ FeedbackDetailEntity $FeedbackDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackDetailEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
-      json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
   if (category != null) {
     feedbackDetailEntity.category = category;
   }
-  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies)
-      .toList();
+  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies).toList();
   if (replies != null) {
     feedbackDetailEntity.replies = replies;
   }
@@ -83,8 +78,7 @@ extension FeedbackDetailEntityExtension on FeedbackDetailEntity {
   }
 }
 
-FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
-    Map<String, dynamic> json) {
+FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json) {
   final FeedbackDetailReplies feedbackDetailReplies = FeedbackDetailReplies();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -103,16 +97,14 @@ FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
   if (createdAt != null) {
     feedbackDetailReplies.createdAt = createdAt;
   }
-  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(
-      json['accountable']);
+  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(json['accountable']);
   if (accountable != null) {
     feedbackDetailReplies.accountable = accountable;
   }
   return feedbackDetailReplies;
 }
 
-Map<String, dynamic> $FeedbackDetailRepliesToJson(
-    FeedbackDetailReplies entity) {
+Map<String, dynamic> $FeedbackDetailRepliesToJson(FeedbackDetailReplies entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

packages/cs_domain/lib/generated/json/feedback_list_entity.g.dart

@@ -21,11 +21,8 @@ FeedbackListEntity $FeedbackListEntityFromJson(Map<String, dynamic> json) {
   if (limit != null) {
     feedbackListEntity.limit = limit;
   }
-  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity)
-      .toList();
+  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity).toList();
   if (list != null) {
     feedbackListEntity.list = list;
   }
@@ -81,8 +78,7 @@ FeedbackItemEntity $FeedbackItemEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackItemEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
-      json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
   if (category != null) {
     feedbackItemEntity.category = category;
   }

packages/cs_domain/lib/generated/json/form_content_entity.g.dart

@@ -5,25 +5,20 @@ import 'dart:typed_data';
 
 FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   final FormContentEntity formContentEntity = FormContentEntity();
-  final String? typeOfApplication = jsonConvert.convert<String>(
-      json['type_of_application']);
+  final String? typeOfApplication = jsonConvert.convert<String>(json['type_of_application']);
   if (typeOfApplication != null) {
     formContentEntity.typeOfApplication = typeOfApplication;
   }
-  final String? notesToRecipient = jsonConvert.convert<String>(
-      json['notes_to_recipient']);
+  final String? notesToRecipient = jsonConvert.convert<String>(json['notes_to_recipient']);
   if (notesToRecipient != null) {
     formContentEntity.notesToRecipient = notesToRecipient;
   }
-  final String? notesToManagement = jsonConvert.convert<String>(
-      json['notes_to_management']);
+  final String? notesToManagement = jsonConvert.convert<String>(json['notes_to_management']);
   if (notesToManagement != null) {
     formContentEntity.notesToManagement = notesToManagement;
   }
-  final List<String>? attachments = (json['attachments'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<String>(e) as String)
-      .toList();
+  final List<String>? attachments = (json['attachments'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<String>(e) as String).toList();
   if (attachments != null) {
     formContentEntity.attachments = attachments;
   }
@@ -35,13 +30,11 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (signatureByteData != null) {
     formContentEntity.signatureByteData = signatureByteData;
   }
-  final String? ownershipStatus = jsonConvert.convert<String>(
-      json['ownership_status']);
+  final String? ownershipStatus = jsonConvert.convert<String>(json['ownership_status']);
   if (ownershipStatus != null) {
     formContentEntity.ownershipStatus = ownershipStatus;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(
-      json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
   if (vehicleNumber != null) {
     formContentEntity.vehicleNumber = vehicleNumber;
   }
@@ -49,8 +42,7 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (iuNumber != null) {
     formContentEntity.iuNumber = iuNumber;
   }
-  final String? vehicleMakeModelColour = jsonConvert.convert<String>(
-      json['vehicle_make_model_colour']);
+  final String? vehicleMakeModelColour = jsonConvert.convert<String>(json['vehicle_make_model_colour']);
   if (vehicleMakeModelColour != null) {
     formContentEntity.vehicleMakeModelColour = vehicleMakeModelColour;
   }
@@ -62,33 +54,27 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (endDate != null) {
     formContentEntity.endDate = endDate;
   }
-  final String? timeOrArrival = jsonConvert.convert<String>(
-      json['time_or_arrival']);
+  final String? timeOrArrival = jsonConvert.convert<String>(json['time_or_arrival']);
   if (timeOrArrival != null) {
     formContentEntity.timeOrArrival = timeOrArrival;
   }
-  final String? movingCompany = jsonConvert.convert<String>(
-      json['moving_company']);
+  final String? movingCompany = jsonConvert.convert<String>(json['moving_company']);
   if (movingCompany != null) {
     formContentEntity.movingCompany = movingCompany;
   }
-  final String? personInCharge = jsonConvert.convert<String>(
-      json['person_in_charge']);
+  final String? personInCharge = jsonConvert.convert<String>(json['person_in_charge']);
   if (personInCharge != null) {
     formContentEntity.personInCharge = personInCharge;
   }
-  final String? mobileNumber = jsonConvert.convert<String>(
-      json['mobile_number']);
+  final String? mobileNumber = jsonConvert.convert<String>(json['mobile_number']);
   if (mobileNumber != null) {
     formContentEntity.mobileNumber = mobileNumber;
   }
-  final String? companyAddress = jsonConvert.convert<String>(
-      json['company_address']);
+  final String? companyAddress = jsonConvert.convert<String>(json['company_address']);
   if (companyAddress != null) {
     formContentEntity.companyAddress = companyAddress;
   }
-  final String? dateOfEntry = jsonConvert.convert<String>(
-      json['date_of_entry']);
+  final String? dateOfEntry = jsonConvert.convert<String>(json['date_of_entry']);
   if (dateOfEntry != null) {
     formContentEntity.dateOfEntry = dateOfEntry;
   }
@@ -96,38 +82,31 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (guestName != null) {
     formContentEntity.guestName = guestName;
   }
-  final String? guestMobileNumber = jsonConvert.convert<String>(
-      json['guest_mobile_number']);
+  final String? guestMobileNumber = jsonConvert.convert<String>(json['guest_mobile_number']);
   if (guestMobileNumber != null) {
     formContentEntity.guestMobileNumber = guestMobileNumber;
   }
-  final String? renovationStartDate = jsonConvert.convert<String>(
-      json['renovation_start_date']);
+  final String? renovationStartDate = jsonConvert.convert<String>(json['renovation_start_date']);
   if (renovationStartDate != null) {
     formContentEntity.renovationStartDate = renovationStartDate;
   }
-  final String? renovationEndDate = jsonConvert.convert<String>(
-      json['renovation_end_date']);
+  final String? renovationEndDate = jsonConvert.convert<String>(json['renovation_end_date']);
   if (renovationEndDate != null) {
     formContentEntity.renovationEndDate = renovationEndDate;
   }
-  final String? hackingStartDate = jsonConvert.convert<String>(
-      json['hacking_start_date']);
+  final String? hackingStartDate = jsonConvert.convert<String>(json['hacking_start_date']);
   if (hackingStartDate != null) {
     formContentEntity.hackingStartDate = hackingStartDate;
   }
-  final String? hackingEndDate = jsonConvert.convert<String>(
-      json['hacking_end_date']);
+  final String? hackingEndDate = jsonConvert.convert<String>(json['hacking_end_date']);
   if (hackingEndDate != null) {
     formContentEntity.hackingEndDate = hackingEndDate;
   }
-  final String? renovationCompany = jsonConvert.convert<String>(
-      json['renovation_company']);
+  final String? renovationCompany = jsonConvert.convert<String>(json['renovation_company']);
   if (renovationCompany != null) {
     formContentEntity.renovationCompany = renovationCompany;
   }
-  final String? listOfRenovationWorks = jsonConvert.convert<String>(
-      json['list_of_renovation_works']);
+  final String? listOfRenovationWorks = jsonConvert.convert<String>(json['list_of_renovation_works']);
   if (listOfRenovationWorks != null) {
     formContentEntity.listOfRenovationWorks = listOfRenovationWorks;
   }
@@ -204,8 +183,7 @@ extension FormContentEntityExtension on FormContentEntity {
       ..ownershipStatus = ownershipStatus ?? this.ownershipStatus
       ..vehicleNumber = vehicleNumber ?? this.vehicleNumber
       ..iuNumber = iuNumber ?? this.iuNumber
-      ..vehicleMakeModelColour = vehicleMakeModelColour ??
-          this.vehicleMakeModelColour
+      ..vehicleMakeModelColour = vehicleMakeModelColour ?? this.vehicleMakeModelColour
       ..startDate = startDate ?? this.startDate
       ..endDate = endDate ?? this.endDate
       ..timeOrArrival = timeOrArrival ?? this.timeOrArrival
@@ -221,7 +199,6 @@ extension FormContentEntityExtension on FormContentEntity {
       ..hackingStartDate = hackingStartDate ?? this.hackingStartDate
       ..hackingEndDate = hackingEndDate ?? this.hackingEndDate
       ..renovationCompany = renovationCompany ?? this.renovationCompany
-      ..listOfRenovationWorks = listOfRenovationWorks ??
-          this.listOfRenovationWorks;
+      ..listOfRenovationWorks = listOfRenovationWorks ?? this.listOfRenovationWorks;
   }
 }

packages/cs_domain/lib/generated/json/form_detail_entity.g.dart

@@ -13,8 +13,7 @@ FormDetailEntity $FormDetailEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formDetailEntity.userId = userId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
-      json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
   if (content != null) {
     formDetailEntity.content = content;
   }
@@ -26,7 +25,7 @@ FormDetailEntity $FormDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     formDetailEntity.createdAt = createdAt;
   }
-  final String? updateAt = jsonConvert.convert<String>(json['update_at']);
+  final String? updateAt = jsonConvert.convert<String>(json['updated_at']);
   if (updateAt != null) {
     formDetailEntity.updateAt = updateAt;
   }
@@ -44,7 +43,7 @@ Map<String, dynamic> $FormDetailEntityToJson(FormDetailEntity entity) {
   data['content'] = entity.content?.toJson();
   data['status'] = entity.status;
   data['created_at'] = entity.createdAt;
-  data['update_at'] = entity.updateAt;
+  data['updated_at'] = entity.updateAt;
   data['order'] = entity.order?.toJson();
   return data;
 }
@@ -84,8 +83,7 @@ FormOrder $FormOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     formOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(
-      json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
   if (depositAmount != null) {
     formOrder.depositAmount = depositAmount;
   }

packages/cs_domain/lib/generated/json/form_list_entity.g.dart

@@ -7,8 +7,7 @@ FormListEntity $FormListEntityFromJson(Map<String, dynamic> json) {
   if (id != null) {
     formListEntity.id = id;
   }
-  final String? typeId = jsonConvert.convert<String>(
-      json['online_form_type_id']);
+  final String? typeId = jsonConvert.convert<String>(json['online_form_type_id']);
   if (typeId != null) {
     formListEntity.typeId = typeId;
   }

packages/cs_domain/lib/generated/json/form_option_entity.g.dart

@@ -3,14 +3,12 @@ import 'package:domain/entity/form_option_entity.dart';
 
 FormOptionEntity $FormOptionEntityFromJson(Map<String, dynamic> json) {
   final FormOptionEntity formOptionEntity = FormOptionEntity();
-  final List<String>? typeOfApplication = (json['type_of_application'] as List<
-      dynamic>?)?.map(
+  final List<String>? typeOfApplication = (json['type_of_application'] as List<dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (typeOfApplication != null) {
     formOptionEntity.typeOfApplication = typeOfApplication;
   }
-  final List<String>? ownershipStatus = (json['ownership_status'] as List<
-      dynamic>?)?.map(
+  final List<String>? ownershipStatus = (json['ownership_status'] as List<dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (ownershipStatus != null) {
     formOptionEntity.ownershipStatus = ownershipStatus;

packages/cs_domain/lib/generated/json/form_order_entity.g.dart

@@ -15,8 +15,7 @@ FormOrderEntity $FormOrderEntityFromJson(Map<String, dynamic> json) {
   if (status != null) {
     formOrderEntity.status = status;
   }
-  final FormOrderOrder? order = jsonConvert.convert<FormOrderOrder>(
-      json['order']);
+  final FormOrderOrder? order = jsonConvert.convert<FormOrderOrder>(json['order']);
   if (order != null) {
     formOrderEntity.order = order;
   }
@@ -61,18 +60,15 @@ FormOrderOrder $FormOrderOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     formOrderOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(
-      json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
   if (depositAmount != null) {
     formOrderOrder.depositAmount = depositAmount;
   }
-  final String? paymentStatus = jsonConvert.convert<String>(
-      json['payment_status']);
+  final String? paymentStatus = jsonConvert.convert<String>(json['payment_status']);
   if (paymentStatus != null) {
     formOrderOrder.paymentStatus = paymentStatus;
   }
-  final String? refundStatus = jsonConvert.convert<String>(
-      json['refund_status']);
+  final String? refundStatus = jsonConvert.convert<String>(json['refund_status']);
   if (refundStatus != null) {
     formOrderOrder.refundStatus = refundStatus;
   }

packages/cs_domain/lib/generated/json/form_submitted_entity.g.dart

@@ -13,8 +13,7 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formSubmittedEntity.userId = userId;
   }
-  final String? estateOnlineFormId = jsonConvert.convert<String>(
-      json['estate_online_form_id']);
+  final String? estateOnlineFormId = jsonConvert.convert<String>(json['estate_online_form_id']);
   if (estateOnlineFormId != null) {
     formSubmittedEntity.estateOnlineFormId = estateOnlineFormId;
   }
@@ -30,18 +29,15 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (approvedOn != null) {
     formSubmittedEntity.approvedOn = approvedOn;
   }
-  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<
-      FormSubmittedEstateOnlineForm>(json['estate_online_form']);
+  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<FormSubmittedEstateOnlineForm>(json['estate_online_form']);
   if (estateOnlineForm != null) {
     formSubmittedEntity.estateOnlineForm = estateOnlineForm;
   }
-  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(
-      json['account']);
+  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(json['account']);
   if (account != null) {
     formSubmittedEntity.account = account;
   }
-  final FormSubmittedOrder? order = jsonConvert.convert<FormSubmittedOrder>(
-      json['order']);
+  final FormSubmittedOrder? order = jsonConvert.convert<FormSubmittedOrder>(json['order']);
   if (order != null) {
     formSubmittedEntity.order = order;
   }
@@ -87,8 +83,7 @@ extension FormSubmittedEntityExtension on FormSubmittedEntity {
   }
 }
 
-FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
-    Map<String, dynamic> json) {
+FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String, dynamic> json) {
   final FormSubmittedEstateOnlineForm formSubmittedEstateOnlineForm = FormSubmittedEstateOnlineForm();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -109,8 +104,7 @@ FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
   return formSubmittedEstateOnlineForm;
 }
 
-Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(
-    FormSubmittedEstateOnlineForm entity) {
+Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(FormSubmittedEstateOnlineForm entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;
@@ -148,8 +142,7 @@ FormSubmittedOrder $FormSubmittedOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     formSubmittedOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(
-      json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
   if (depositAmount != null) {
     formSubmittedOrder.depositAmount = depositAmount;
   }

packages/cs_domain/lib/generated/json/form_submitted_page_entity.g.dart

@@ -3,8 +3,7 @@ import 'package:domain/entity/form_submitted_page_entity.dart';
 import 'package:domain/entity/form_submitted_entity.dart';
 
 
-FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
-    Map<String, dynamic> json) {
+FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> json) {
   final FormSubmittedPageEntity formSubmittedPageEntity = FormSubmittedPageEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -22,19 +21,15 @@ FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
   if (countPage != null) {
     formSubmittedPageEntity.countPage = countPage;
   }
-  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity)
-      .toList();
+  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity).toList();
   if (list != null) {
     formSubmittedPageEntity.list = list;
   }
   return formSubmittedPageEntity;
 }
 
-Map<String, dynamic> $FormSubmittedPageEntityToJson(
-    FormSubmittedPageEntity entity) {
+Map<String, dynamic> $FormSubmittedPageEntityToJson(FormSubmittedPageEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/garage_sale_history_entity.g.dart

@@ -3,8 +3,7 @@ import 'package:domain/entity/garage_sale_history_entity.dart';
 import 'package:domain/entity/id_name_entity.dart';
 
 
-GarageSaleHistoryEntity $GarageSaleHistoryEntityFromJson(
-    Map<String, dynamic> json) {
+GarageSaleHistoryEntity $GarageSaleHistoryEntityFromJson(Map<String, dynamic> json) {
   final GarageSaleHistoryEntity garageSaleHistoryEntity = GarageSaleHistoryEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -22,19 +21,15 @@ GarageSaleHistoryEntity $GarageSaleHistoryEntityFromJson(
   if (countPage != null) {
     garageSaleHistoryEntity.countPage = countPage;
   }
-  final List<GarageSaleHistoryList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<GarageSaleHistoryList>(e) as GarageSaleHistoryList)
-      .toList();
+  final List<GarageSaleHistoryList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<GarageSaleHistoryList>(e) as GarageSaleHistoryList).toList();
   if (list != null) {
     garageSaleHistoryEntity.list = list;
   }
   return garageSaleHistoryEntity;
 }
 
-Map<String, dynamic> $GarageSaleHistoryEntityToJson(
-    GarageSaleHistoryEntity entity) {
+Map<String, dynamic> $GarageSaleHistoryEntityToJson(GarageSaleHistoryEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -61,8 +56,7 @@ extension GarageSaleHistoryEntityExtension on GarageSaleHistoryEntity {
   }
 }
 
-GarageSaleHistoryList $GarageSaleHistoryListFromJson(
-    Map<String, dynamic> json) {
+GarageSaleHistoryList $GarageSaleHistoryListFromJson(Map<String, dynamic> json) {
   final GarageSaleHistoryList garageSaleHistoryList = GarageSaleHistoryList();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -80,30 +74,23 @@ GarageSaleHistoryList $GarageSaleHistoryListFromJson(
   if (createdAt != null) {
     garageSaleHistoryList.createdAt = createdAt;
   }
-  final IdNameEntity? service = jsonConvert.convert<IdNameEntity>(
-      json['service']);
+  final IdNameEntity? service = jsonConvert.convert<IdNameEntity>(json['service']);
   if (service != null) {
     garageSaleHistoryList.service = service;
   }
-  final IdNameEntity? merchant = jsonConvert.convert<IdNameEntity>(
-      json['merchant']);
+  final IdNameEntity? merchant = jsonConvert.convert<IdNameEntity>(json['merchant']);
   if (merchant != null) {
     garageSaleHistoryList.merchant = merchant;
   }
-  final List<
-      GarageSaleHistoryListOrderProducts>? orderProducts = (json['order_products'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<GarageSaleHistoryListOrderProducts>(
-          e) as GarageSaleHistoryListOrderProducts).toList();
+  final List<GarageSaleHistoryListOrderProducts>? orderProducts = (json['order_products'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<GarageSaleHistoryListOrderProducts>(e) as GarageSaleHistoryListOrderProducts).toList();
   if (orderProducts != null) {
     garageSaleHistoryList.orderProducts = orderProducts;
   }
   return garageSaleHistoryList;
 }
 
-Map<String, dynamic> $GarageSaleHistoryListToJson(
-    GarageSaleHistoryList entity) {
+Map<String, dynamic> $GarageSaleHistoryListToJson(GarageSaleHistoryList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['sn'] = entity.sn;
@@ -136,8 +123,7 @@ extension GarageSaleHistoryListExtension on GarageSaleHistoryList {
   }
 }
 
-GarageSaleHistoryListOrderProducts $GarageSaleHistoryListOrderProductsFromJson(
-    Map<String, dynamic> json) {
+GarageSaleHistoryListOrderProducts $GarageSaleHistoryListOrderProductsFromJson(Map<String, dynamic> json) {
   final GarageSaleHistoryListOrderProducts garageSaleHistoryListOrderProducts = GarageSaleHistoryListOrderProducts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -155,16 +141,14 @@ GarageSaleHistoryListOrderProducts $GarageSaleHistoryListOrderProductsFromJson(
   if (totalAmount != null) {
     garageSaleHistoryListOrderProducts.totalAmount = totalAmount;
   }
-  final String? plannedServiceAt = jsonConvert.convert<String>(
-      json['planned_service_at']);
+  final String? plannedServiceAt = jsonConvert.convert<String>(json['planned_service_at']);
   if (plannedServiceAt != null) {
     garageSaleHistoryListOrderProducts.plannedServiceAt = plannedServiceAt;
   }
   return garageSaleHistoryListOrderProducts;
 }
 
-Map<String, dynamic> $GarageSaleHistoryListOrderProductsToJson(
-    GarageSaleHistoryListOrderProducts entity) {
+Map<String, dynamic> $GarageSaleHistoryListOrderProductsToJson(GarageSaleHistoryListOrderProducts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['product_name'] = entity.productName;

packages/cs_domain/lib/generated/json/garage_sale_rent_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 
-GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(
-    Map<String, dynamic> json) {
+GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(Map<String, dynamic> json) {
   final GarageSaleRentDetailEntity garageSaleRentDetailEntity = GarageSaleRentDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -37,16 +36,14 @@ GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(
   if (contact != null) {
     garageSaleRentDetailEntity.contact = contact;
   }
-  final GarageSaleRentDetailAccount? account = jsonConvert.convert<
-      GarageSaleRentDetailAccount>(json['account']);
+  final GarageSaleRentDetailAccount? account = jsonConvert.convert<GarageSaleRentDetailAccount>(json['account']);
   if (account != null) {
     garageSaleRentDetailEntity.account = account;
   }
   return garageSaleRentDetailEntity;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailEntityToJson(
-    GarageSaleRentDetailEntity entity) {
+Map<String, dynamic> $GarageSaleRentDetailEntityToJson(GarageSaleRentDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;
@@ -85,8 +82,7 @@ extension GarageSaleRentDetailEntityExtension on GarageSaleRentDetailEntity {
   }
 }
 
-GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(
-    Map<String, dynamic> json) {
+GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(Map<String, dynamic> json) {
   final GarageSaleRentDetailAccount garageSaleRentDetailAccount = GarageSaleRentDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -103,8 +99,7 @@ GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(
   return garageSaleRentDetailAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailAccountToJson(
-    GarageSaleRentDetailAccount entity) {
+Map<String, dynamic> $GarageSaleRentDetailAccountToJson(GarageSaleRentDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/garage_sale_rent_entity.g.dart

@@ -19,11 +19,8 @@ GarageSaleRentEntity $GarageSaleRentEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     garageSaleRentEntity.countPage = countPage;
   }
-  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList)
-      .toList();
+  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList).toList();
   if (list != null) {
     garageSaleRentEntity.list = list;
   }
@@ -88,8 +85,7 @@ GarageSaleRentList $GarageSaleRentListFromJson(Map<String, dynamic> json) {
   if (likesCount != null) {
     garageSaleRentList.likesCount = likesCount;
   }
-  final GarageSaleRentListAccount? account = jsonConvert.convert<
-      GarageSaleRentListAccount>(json['account']);
+  final GarageSaleRentListAccount? account = jsonConvert.convert<GarageSaleRentListAccount>(json['account']);
   if (account != null) {
     garageSaleRentList.account = account;
   }
@@ -132,8 +128,7 @@ extension GarageSaleRentListExtension on GarageSaleRentList {
   }
 }
 
-GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(
-    Map<String, dynamic> json) {
+GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(Map<String, dynamic> json) {
   final GarageSaleRentListAccount garageSaleRentListAccount = GarageSaleRentListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -150,8 +145,7 @@ GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(
   return garageSaleRentListAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentListAccountToJson(
-    GarageSaleRentListAccount entity) {
+Map<String, dynamic> $GarageSaleRentListAccountToJson(GarageSaleRentListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/home_list_entity.g.dart

@@ -3,39 +3,23 @@ import 'package:domain/entity/home_list_entity.dart';
 
 HomeListEntity $HomeListEntityFromJson(Map<String, dynamic> json) {
   final HomeListEntity homeListEntity = HomeListEntity();
-  final List<HomeListBanners>? banners = (json['banners'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<HomeListBanners>(e) as HomeListBanners)
-      .toList();
+  final List<HomeListBanners>? banners = (json['banners'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HomeListBanners>(e) as HomeListBanners).toList();
   if (banners != null) {
     homeListEntity.banners = banners;
   }
-  final List<
-      HomeListLatestTransactions>? latestTransactions = (json['latest_transactions'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<HomeListLatestTransactions>(
-          e) as HomeListLatestTransactions).toList();
+  final List<HomeListLatestTransactions>? latestTransactions = (json['latest_transactions'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HomeListLatestTransactions>(e) as HomeListLatestTransactions).toList();
   if (latestTransactions != null) {
     homeListEntity.latestTransactions = latestTransactions;
   }
-  final List<
-      HomeListPropertyNews>? propertyNews = (json['property_news'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews)
-      .toList();
+  final List<HomeListPropertyNews>? propertyNews = (json['property_news'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews).toList();
   if (propertyNews != null) {
     homeListEntity.propertyNews = propertyNews;
   }
-  final List<
-      HomeListPropertyNews>? strataManagementGuides = (json['strata_management_guides'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews)
-      .toList();
+  final List<HomeListPropertyNews>? strataManagementGuides = (json['strata_management_guides'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews).toList();
   if (strataManagementGuides != null) {
     homeListEntity.strataManagementGuides = strataManagementGuides;
   }
@@ -45,11 +29,9 @@ HomeListEntity $HomeListEntityFromJson(Map<String, dynamic> json) {
 Map<String, dynamic> $HomeListEntityToJson(HomeListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['banners'] = entity.banners.map((v) => v.toJson()).toList();
-  data['latest_transactions'] =
-      entity.latestTransactions.map((v) => v.toJson()).toList();
+  data['latest_transactions'] = entity.latestTransactions.map((v) => v.toJson()).toList();
   data['property_news'] = entity.propertyNews.map((v) => v.toJson()).toList();
-  data['strata_management_guides'] =
-      entity.strataManagementGuides.map((v) => v.toJson()).toList();
+  data['strata_management_guides'] = entity.strataManagementGuides.map((v) => v.toJson()).toList();
   return data;
 }
 
@@ -64,8 +46,7 @@ extension HomeListEntityExtension on HomeListEntity {
       ..banners = banners ?? this.banners
       ..latestTransactions = latestTransactions ?? this.latestTransactions
       ..propertyNews = propertyNews ?? this.propertyNews
-      ..strataManagementGuides = strataManagementGuides ??
-          this.strataManagementGuides;
+      ..strataManagementGuides = strataManagementGuides ?? this.strataManagementGuides;
   }
 }
 
@@ -107,8 +88,7 @@ extension HomeListBannersExtension on HomeListBanners {
   }
 }
 
-HomeListLatestTransactions $HomeListLatestTransactionsFromJson(
-    Map<String, dynamic> json) {
+HomeListLatestTransactions $HomeListLatestTransactionsFromJson(Map<String, dynamic> json) {
   final HomeListLatestTransactions homeListLatestTransactions = HomeListLatestTransactions();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -133,8 +113,7 @@ HomeListLatestTransactions $HomeListLatestTransactionsFromJson(
   return homeListLatestTransactions;
 }
 
-Map<String, dynamic> $HomeListLatestTransactionsToJson(
-    HomeListLatestTransactions entity) {
+Map<String, dynamic> $HomeListLatestTransactionsToJson(HomeListLatestTransactions entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['type'] = entity.type;

packages/cs_domain/lib/generated/json/latest_news_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/latest_news_detail_entity.dart';
 
-LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(
-    Map<String, dynamic> json) {
+LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(Map<String, dynamic> json) {
   final LatestNewsDetailEntity latestNewsDetailEntity = LatestNewsDetailEntity();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -31,8 +30,7 @@ LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(
   return latestNewsDetailEntity;
 }
 
-Map<String, dynamic> $LatestNewsDetailEntityToJson(
-    LatestNewsDetailEntity entity) {
+Map<String, dynamic> $LatestNewsDetailEntityToJson(LatestNewsDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['type'] = entity.type;

packages/cs_domain/lib/generated/json/latest_news_page_entity.g.dart

@@ -19,10 +19,8 @@ LatestNewsPageEntity $LatestNewsPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     latestNewsPageEntity.countPage = countPage;
   }
-  final List<LatestNewsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<LatestNewsList>(e) as LatestNewsList)
-      .toList();
+  final List<LatestNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<LatestNewsList>(e) as LatestNewsList).toList();
   if (list != null) {
     latestNewsPageEntity.list = list;
   }

packages/cs_domain/lib/generated/json/myfollowing_list_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myfollowing_list_entity.dart';
 
-MyfollowingListEntity $MyfollowingListEntityFromJson(
-    Map<String, dynamic> json) {
+MyfollowingListEntity $MyfollowingListEntityFromJson(Map<String, dynamic> json) {
   final MyfollowingListEntity myfollowingListEntity = MyfollowingListEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,8 +18,7 @@ MyfollowingListEntity $MyfollowingListEntityFromJson(
   return myfollowingListEntity;
 }
 
-Map<String, dynamic> $MyfollowingListEntityToJson(
-    MyfollowingListEntity entity) {
+Map<String, dynamic> $MyfollowingListEntityToJson(MyfollowingListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/myposts_newsfeed_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_newsfeed_entity.dart';
 
-MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(
-    Map<String, dynamic> json) {
+MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(Map<String, dynamic> json) {
   final MypostsNewsfeedEntity mypostsNewsfeedEntity = MypostsNewsfeedEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(
   if (countPage != null) {
     mypostsNewsfeedEntity.countPage = countPage;
   }
-  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList)
-      .toList();
+  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList).toList();
   if (list != null) {
     mypostsNewsfeedEntity.list = list;
   }
   return mypostsNewsfeedEntity;
 }
 
-Map<String, dynamic> $MypostsNewsfeedEntityToJson(
-    MypostsNewsfeedEntity entity) {
+Map<String, dynamic> $MypostsNewsfeedEntityToJson(MypostsNewsfeedEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -90,8 +85,7 @@ MypostsNewsfeedList $MypostsNewsfeedListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     mypostsNewsfeedList.createdAt = createdAt;
   }
-  final MypostsNewsfeedListAccount? account = jsonConvert.convert<
-      MypostsNewsfeedListAccount>(json['account']);
+  final MypostsNewsfeedListAccount? account = jsonConvert.convert<MypostsNewsfeedListAccount>(json['account']);
   if (account != null) {
     mypostsNewsfeedList.account = account;
   }
@@ -134,8 +128,7 @@ extension MypostsNewsfeedListExtension on MypostsNewsfeedList {
   }
 }
 
-MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(
-    Map<String, dynamic> json) {
+MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(Map<String, dynamic> json) {
   final MypostsNewsfeedListAccount mypostsNewsfeedListAccount = MypostsNewsfeedListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -156,8 +149,7 @@ MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(
   return mypostsNewsfeedListAccount;
 }
 
-Map<String, dynamic> $MypostsNewsfeedListAccountToJson(
-    MypostsNewsfeedListAccount entity) {
+Map<String, dynamic> $MypostsNewsfeedListAccountToJson(MypostsNewsfeedListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/myposts_sale_rent_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_sale_rent_entity.dart';
 
-MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(
-    Map<String, dynamic> json) {
+MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(Map<String, dynamic> json) {
   final MypostsSaleRentEntity mypostsSaleRentEntity = MypostsSaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(
   if (countPage != null) {
     mypostsSaleRentEntity.countPage = countPage;
   }
-  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList)
-      .toList();
+  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList).toList();
   if (list != null) {
     mypostsSaleRentEntity.list = list;
   }
   return mypostsSaleRentEntity;
 }
 
-Map<String, dynamic> $MypostsSaleRentEntityToJson(
-    MypostsSaleRentEntity entity) {
+Map<String, dynamic> $MypostsSaleRentEntityToJson(MypostsSaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/newsfeed_comment_publish_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_comment_publish_entity.dart';
 
-NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
-    Map<String, dynamic> json) {
+NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, dynamic> json) {
   final NewsfeedCommentPublishEntity newsfeedCommentPublishEntity = NewsfeedCommentPublishEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,8 +18,7 @@ NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
   return newsfeedCommentPublishEntity;
 }
 
-Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(
-    NewsfeedCommentPublishEntity entity) {
+Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(NewsfeedCommentPublishEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

packages/cs_domain/lib/generated/json/newsfeed_detail_entity.g.dart

@@ -40,17 +40,12 @@ NewsfeedDetailEntity $NewsfeedDetailEntityFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     newsfeedDetailEntity.liked = liked;
   }
-  final NewsfeedDetailAccount? account = jsonConvert.convert<
-      NewsfeedDetailAccount>(json['account']);
+  final NewsfeedDetailAccount? account = jsonConvert.convert<NewsfeedDetailAccount>(json['account']);
   if (account != null) {
     newsfeedDetailEntity.account = account;
   }
-  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments)
-      .toList();
+  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments).toList();
   if (comments != null) {
     newsfeedDetailEntity.comments = comments;
   }
@@ -102,8 +97,7 @@ extension NewsfeedDetailEntityExtension on NewsfeedDetailEntity {
   }
 }
 
-NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailAccount newsfeedDetailAccount = NewsfeedDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -124,8 +118,7 @@ NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
   return newsfeedDetailAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailAccountToJson(
-    NewsfeedDetailAccount entity) {
+Map<String, dynamic> $NewsfeedDetailAccountToJson(NewsfeedDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -149,8 +142,7 @@ extension NewsfeedDetailAccountExtension on NewsfeedDetailAccount {
   }
 }
 
-NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailComments newsfeedDetailComments = NewsfeedDetailComments();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -164,21 +156,18 @@ NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
   if (createdAt != null) {
     newsfeedDetailComments.createdAt = createdAt;
   }
-  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<
-      NewsfeedDetailCommentsAccount>(json['account']);
+  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<NewsfeedDetailCommentsAccount>(json['account']);
   if (account != null) {
     newsfeedDetailComments.account = account;
   }
-  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<
-      NewsfeedDetailCommentsToAccount>(json['to_account']);
+  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<NewsfeedDetailCommentsToAccount>(json['to_account']);
   if (toAccount != null) {
     newsfeedDetailComments.toAccount = toAccount;
   }
   return newsfeedDetailComments;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToJson(
-    NewsfeedDetailComments entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToJson(NewsfeedDetailComments entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -205,8 +194,7 @@ extension NewsfeedDetailCommentsExtension on NewsfeedDetailComments {
   }
 }
 
-NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailCommentsAccount newsfeedDetailCommentsAccount = NewsfeedDetailCommentsAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -223,8 +211,7 @@ NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
   return newsfeedDetailCommentsAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(
-    NewsfeedDetailCommentsAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(NewsfeedDetailCommentsAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -245,8 +232,7 @@ extension NewsfeedDetailCommentsAccountExtension on NewsfeedDetailCommentsAccoun
   }
 }
 
-NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailCommentsToAccount newsfeedDetailCommentsToAccount = NewsfeedDetailCommentsToAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -263,8 +249,7 @@ NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
   return newsfeedDetailCommentsToAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(
-    NewsfeedDetailCommentsToAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(NewsfeedDetailCommentsToAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_following_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_following_entity.dart';
 
-NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingEntity newsfeedFollowingEntity = NewsfeedFollowingEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
   if (countPage != null) {
     newsfeedFollowingEntity.countPage = countPage;
   }
-  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList)
-      .toList();
+  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList).toList();
   if (list != null) {
     newsfeedFollowingEntity.list = list;
   }
   return newsfeedFollowingEntity;
 }
 
-Map<String, dynamic> $NewsfeedFollowingEntityToJson(
-    NewsfeedFollowingEntity entity) {
+Map<String, dynamic> $NewsfeedFollowingEntityToJson(NewsfeedFollowingEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -59,8 +54,7 @@ extension NewsfeedFollowingEntityExtension on NewsfeedFollowingEntity {
   }
 }
 
-NewsfeedFollowingList $NewsfeedFollowingListFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingList newsfeedFollowingList = NewsfeedFollowingList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -91,16 +85,14 @@ NewsfeedFollowingList $NewsfeedFollowingListFromJson(
   if (createdAt != null) {
     newsfeedFollowingList.createdAt = createdAt;
   }
-  final NewsfeedFollowingListAccount? account = jsonConvert.convert<
-      NewsfeedFollowingListAccount>(json['account']);
+  final NewsfeedFollowingListAccount? account = jsonConvert.convert<NewsfeedFollowingListAccount>(json['account']);
   if (account != null) {
     newsfeedFollowingList.account = account;
   }
   return newsfeedFollowingList;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListToJson(
-    NewsfeedFollowingList entity) {
+Map<String, dynamic> $NewsfeedFollowingListToJson(NewsfeedFollowingList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -136,8 +128,7 @@ extension NewsfeedFollowingListExtension on NewsfeedFollowingList {
   }
 }
 
-NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingListAccount newsfeedFollowingListAccount = NewsfeedFollowingListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -158,8 +149,7 @@ NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
   return newsfeedFollowingListAccount;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListAccountToJson(
-    NewsfeedFollowingListAccount entity) {
+Map<String, dynamic> $NewsfeedFollowingListAccountToJson(NewsfeedFollowingListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_foryou_entity.g.dart

@@ -19,11 +19,8 @@ NewsfeedForyouEntity $NewsfeedForyouEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedForyouEntity.countPage = countPage;
   }
-  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList)
-      .toList();
+  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList).toList();
   if (list != null) {
     newsfeedForyouEntity.list = list;
   }
@@ -88,8 +85,7 @@ NewsfeedForyouList $NewsfeedForyouListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedForyouList.createdAt = createdAt;
   }
-  final NewsfeedForyouListAccount? account = jsonConvert.convert<
-      NewsfeedForyouListAccount>(json['account']);
+  final NewsfeedForyouListAccount? account = jsonConvert.convert<NewsfeedForyouListAccount>(json['account']);
   if (account != null) {
     newsfeedForyouList.account = account;
   }
@@ -132,8 +128,7 @@ extension NewsfeedForyouListExtension on NewsfeedForyouList {
   }
 }
 
-NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedForyouListAccount newsfeedForyouListAccount = NewsfeedForyouListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -154,8 +149,7 @@ NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
   return newsfeedForyouListAccount;
 }
 
-Map<String, dynamic> $NewsfeedForyouListAccountToJson(
-    NewsfeedForyouListAccount entity) {
+Map<String, dynamic> $NewsfeedForyouListAccountToJson(NewsfeedForyouListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_news_entity.g.dart

@@ -19,10 +19,8 @@ NewsfeedNewsEntity $NewsfeedNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedNewsEntity.countPage = countPage;
   }
-  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList)
-      .toList();
+  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList).toList();
   if (list != null) {
     newsfeedNewsEntity.list = list;
   }
@@ -87,8 +85,7 @@ NewsfeedNewsList $NewsfeedNewsListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedNewsList.createdAt = createdAt;
   }
-  final NewsfeedNewsListAccount? account = jsonConvert.convert<
-      NewsfeedNewsListAccount>(json['account']);
+  final NewsfeedNewsListAccount? account = jsonConvert.convert<NewsfeedNewsListAccount>(json['account']);
   if (account != null) {
     newsfeedNewsList.account = account;
   }
@@ -131,8 +128,7 @@ extension NewsfeedNewsListExtension on NewsfeedNewsList {
   }
 }
 
-NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedNewsListAccount newsfeedNewsListAccount = NewsfeedNewsListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -153,8 +149,7 @@ NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
   return newsfeedNewsListAccount;
 }
 
-Map<String, dynamic> $NewsfeedNewsListAccountToJson(
-    NewsfeedNewsListAccount entity) {
+Map<String, dynamic> $NewsfeedNewsListAccountToJson(NewsfeedNewsListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/notice_board_announ_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_announ_detail_entity.dart';
 
-NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardAnnounDetailEntity noticeBoardAnnounDetailEntity = NoticeBoardAnnounDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -28,8 +27,7 @@ NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(
   return noticeBoardAnnounDetailEntity;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounDetailEntityToJson(
-    NoticeBoardAnnounDetailEntity entity) {
+Map<String, dynamic> $NoticeBoardAnnounDetailEntityToJson(NoticeBoardAnnounDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/notice_board_announ_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_announ_entity.dart';
 
-NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardAnnounEntity noticeBoardAnnounEntity = NoticeBoardAnnounEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(
   if (countPage != null) {
     noticeBoardAnnounEntity.countPage = countPage;
   }
-  final List<NoticeBoardAnnounList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NoticeBoardAnnounList>(e) as NoticeBoardAnnounList)
-      .toList();
+  final List<NoticeBoardAnnounList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NoticeBoardAnnounList>(e) as NoticeBoardAnnounList).toList();
   if (list != null) {
     noticeBoardAnnounEntity.list = list;
   }
   return noticeBoardAnnounEntity;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounEntityToJson(
-    NoticeBoardAnnounEntity entity) {
+Map<String, dynamic> $NoticeBoardAnnounEntityToJson(NoticeBoardAnnounEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -59,8 +54,7 @@ extension NoticeBoardAnnounEntityExtension on NoticeBoardAnnounEntity {
   }
 }
 
-NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(Map<String, dynamic> json) {
   final NoticeBoardAnnounList noticeBoardAnnounList = NoticeBoardAnnounList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -77,8 +71,7 @@ NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(
   return noticeBoardAnnounList;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounListToJson(
-    NoticeBoardAnnounList entity) {
+Map<String, dynamic> $NoticeBoardAnnounListToJson(NoticeBoardAnnounList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/notice_board_documents_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_documents_entity.dart';
 
-NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardDocumentsEntity noticeBoardDocumentsEntity = NoticeBoardDocumentsEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,20 +19,15 @@ NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(
   if (countPage != null) {
     noticeBoardDocumentsEntity.countPage = countPage;
   }
-  final List<NoticeBoardDocumentsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NoticeBoardDocumentsList>(
-          e) as NoticeBoardDocumentsList)
-      .toList();
+  final List<NoticeBoardDocumentsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NoticeBoardDocumentsList>(e) as NoticeBoardDocumentsList).toList();
   if (list != null) {
     noticeBoardDocumentsEntity.list = list;
   }
   return noticeBoardDocumentsEntity;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(
-    NoticeBoardDocumentsEntity entity) {
+Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(NoticeBoardDocumentsEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -60,8 +54,7 @@ extension NoticeBoardDocumentsEntityExtension on NoticeBoardDocumentsEntity {
   }
 }
 
-NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(Map<String, dynamic> json) {
   final NoticeBoardDocumentsList noticeBoardDocumentsList = NoticeBoardDocumentsList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -82,8 +75,7 @@ NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(
   return noticeBoardDocumentsList;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsListToJson(
-    NoticeBoardDocumentsList entity) {
+Map<String, dynamic> $NoticeBoardDocumentsListToJson(NoticeBoardDocumentsList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['parent_id'] = entity.parentId;

packages/cs_domain/lib/generated/json/notice_board_event_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_event_detail_entity.dart';
 
-NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardEventDetailEntity noticeBoardEventDetailEntity = NoticeBoardEventDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -32,8 +31,7 @@ NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(
   return noticeBoardEventDetailEntity;
 }
 
-Map<String, dynamic> $NoticeBoardEventDetailEntityToJson(
-    NoticeBoardEventDetailEntity entity) {
+Map<String, dynamic> $NoticeBoardEventDetailEntityToJson(NoticeBoardEventDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/notice_board_event_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_event_entity.dart';
 
-NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardEventEntity noticeBoardEventEntity = NoticeBoardEventEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(
   if (countPage != null) {
     noticeBoardEventEntity.countPage = countPage;
   }
-  final List<NoticeBoardEventList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NoticeBoardEventList>(e) as NoticeBoardEventList)
-      .toList();
+  final List<NoticeBoardEventList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NoticeBoardEventList>(e) as NoticeBoardEventList).toList();
   if (list != null) {
     noticeBoardEventEntity.list = list;
   }
   return noticeBoardEventEntity;
 }
 
-Map<String, dynamic> $NoticeBoardEventEntityToJson(
-    NoticeBoardEventEntity entity) {
+Map<String, dynamic> $NoticeBoardEventEntityToJson(NoticeBoardEventEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/paid_service_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/paid_service_detail_entity.dart';
 
-PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(
-    Map<String, dynamic> json) {
+PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> json) {
   final PaidServiceDetailEntity paidServiceDetailEntity = PaidServiceDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -17,8 +16,7 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(
   if (name != null) {
     paidServiceDetailEntity.name = name;
   }
-  final int? evaluationsAvgScore = jsonConvert.convert<int>(
-      json['evaluations_avg_score']);
+  final int? evaluationsAvgScore = jsonConvert.convert<int>(json['evaluations_avg_score']);
   if (evaluationsAvgScore != null) {
     paidServiceDetailEntity.evaluationsAvgScore = evaluationsAvgScore;
   }
@@ -38,18 +36,15 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(
   if (nightPrice != null) {
     paidServiceDetailEntity.nightPrice = nightPrice;
   }
-  final String? servicePeriodStart = jsonConvert.convert<String>(
-      json['service_period_start']);
+  final String? servicePeriodStart = jsonConvert.convert<String>(json['service_period_start']);
   if (servicePeriodStart != null) {
     paidServiceDetailEntity.servicePeriodStart = servicePeriodStart;
   }
-  final String? servicePeriodEnd = jsonConvert.convert<String>(
-      json['service_period_end']);
+  final String? servicePeriodEnd = jsonConvert.convert<String>(json['service_period_end']);
   if (servicePeriodEnd != null) {
     paidServiceDetailEntity.servicePeriodEnd = servicePeriodEnd;
   }
-  final int? servicePeriodInterval = jsonConvert.convert<int>(
-      json['service_period_interval']);
+  final int? servicePeriodInterval = jsonConvert.convert<int>(json['service_period_interval']);
   if (servicePeriodInterval != null) {
     paidServiceDetailEntity.servicePeriodInterval = servicePeriodInterval;
   }
@@ -57,38 +52,28 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(
   if (description != null) {
     paidServiceDetailEntity.description = description;
   }
-  final PaidServiceDetailMerchant? merchant = jsonConvert.convert<
-      PaidServiceDetailMerchant>(json['merchant']);
+  final PaidServiceDetailMerchant? merchant = jsonConvert.convert<PaidServiceDetailMerchant>(json['merchant']);
   if (merchant != null) {
     paidServiceDetailEntity.merchant = merchant;
   }
-  final PaidServiceDetailCategory? category = jsonConvert.convert<
-      PaidServiceDetailCategory>(json['category']);
+  final PaidServiceDetailCategory? category = jsonConvert.convert<PaidServiceDetailCategory>(json['category']);
   if (category != null) {
     paidServiceDetailEntity.category = category;
   }
-  final List<PaidServiceDetailProducts>? products = (json['products'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<PaidServiceDetailProducts>(
-          e) as PaidServiceDetailProducts).toList();
+  final List<PaidServiceDetailProducts>? products = (json['products'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PaidServiceDetailProducts>(e) as PaidServiceDetailProducts).toList();
   if (products != null) {
     paidServiceDetailEntity.products = products;
   }
-  final List<
-      PaidServiceDetailEvaluations>? evaluations = (json['evaluations'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<PaidServiceDetailEvaluations>(
-          e) as PaidServiceDetailEvaluations).toList();
+  final List<PaidServiceDetailEvaluations>? evaluations = (json['evaluations'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PaidServiceDetailEvaluations>(e) as PaidServiceDetailEvaluations).toList();
   if (evaluations != null) {
     paidServiceDetailEntity.evaluations = evaluations;
   }
   return paidServiceDetailEntity;
 }
 
-Map<String, dynamic> $PaidServiceDetailEntityToJson(
-    PaidServiceDetailEntity entity) {
+Map<String, dynamic> $PaidServiceDetailEntityToJson(PaidServiceDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['resources'] = entity.resources;
@@ -139,8 +124,7 @@ extension PaidServiceDetailEntityExtension on PaidServiceDetailEntity {
       ..nightPrice = nightPrice ?? this.nightPrice
       ..servicePeriodStart = servicePeriodStart ?? this.servicePeriodStart
       ..servicePeriodEnd = servicePeriodEnd ?? this.servicePeriodEnd
-      ..servicePeriodInterval = servicePeriodInterval ??
-          this.servicePeriodInterval
+      ..servicePeriodInterval = servicePeriodInterval ?? this.servicePeriodInterval
       ..description = description ?? this.description
       ..merchant = merchant ?? this.merchant
       ..category = category ?? this.category
@@ -149,8 +133,7 @@ extension PaidServiceDetailEntityExtension on PaidServiceDetailEntity {
   }
 }
 
-PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(
-    Map<String, dynamic> json) {
+PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(Map<String, dynamic> json) {
   final PaidServiceDetailMerchant paidServiceDetailMerchant = PaidServiceDetailMerchant();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -160,16 +143,14 @@ PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(
   if (name != null) {
     paidServiceDetailMerchant.name = name;
   }
-  final String? contactPhone = jsonConvert.convert<String>(
-      json['contact_phone']);
+  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
   if (contactPhone != null) {
     paidServiceDetailMerchant.contactPhone = contactPhone;
   }
   return paidServiceDetailMerchant;
 }
 
-Map<String, dynamic> $PaidServiceDetailMerchantToJson(
-    PaidServiceDetailMerchant entity) {
+Map<String, dynamic> $PaidServiceDetailMerchantToJson(PaidServiceDetailMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -190,8 +171,7 @@ extension PaidServiceDetailMerchantExtension on PaidServiceDetailMerchant {
   }
 }
 
-PaidServiceDetailCategory $PaidServiceDetailCategoryFromJson(
-    Map<String, dynamic> json) {
+PaidServiceDetailCategory $PaidServiceDetailCategoryFromJson(Map<String, dynamic> json) {
   final PaidServiceDetailCategory paidServiceDetailCategory = PaidServiceDetailCategory();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -208,8 +188,7 @@ PaidServiceDetailCategory $PaidServiceDetailCategoryFromJson(
   return paidServiceDetailCategory;
 }
 
-Map<String, dynamic> $PaidServiceDetailCategoryToJson(
-    PaidServiceDetailCategory entity) {
+Map<String, dynamic> $PaidServiceDetailCategoryToJson(PaidServiceDetailCategory entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -230,8 +209,7 @@ extension PaidServiceDetailCategoryExtension on PaidServiceDetailCategory {
   }
 }
 
-PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(
-    Map<String, dynamic> json) {
+PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(Map<String, dynamic> json) {
   final PaidServiceDetailProducts paidServiceDetailProducts = PaidServiceDetailProducts();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -241,8 +219,7 @@ PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(
   if (name != null) {
     paidServiceDetailProducts.name = name;
   }
-  final String? shortDescription = jsonConvert.convert<String>(
-      json['short_description']);
+  final String? shortDescription = jsonConvert.convert<String>(json['short_description']);
   if (shortDescription != null) {
     paidServiceDetailProducts.shortDescription = shortDescription;
   }
@@ -253,8 +230,7 @@ PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(
   return paidServiceDetailProducts;
 }
 
-Map<String, dynamic> $PaidServiceDetailProductsToJson(
-    PaidServiceDetailProducts entity) {
+Map<String, dynamic> $PaidServiceDetailProductsToJson(PaidServiceDetailProducts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -278,8 +254,7 @@ extension PaidServiceDetailProductsExtension on PaidServiceDetailProducts {
   }
 }
 
-PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(
-    Map<String, dynamic> json) {
+PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(Map<String, dynamic> json) {
   final PaidServiceDetailEvaluations paidServiceDetailEvaluations = PaidServiceDetailEvaluations();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -298,8 +273,7 @@ PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(
   if (resources != null) {
     paidServiceDetailEvaluations.resources = resources;
   }
-  final PaidServiceDetailEvaluationsAccount? account = jsonConvert.convert<
-      PaidServiceDetailEvaluationsAccount>(json['account']);
+  final PaidServiceDetailEvaluationsAccount? account = jsonConvert.convert<PaidServiceDetailEvaluationsAccount>(json['account']);
   if (account != null) {
     paidServiceDetailEvaluations.account = account;
   }
@@ -310,8 +284,7 @@ PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(
   return paidServiceDetailEvaluations;
 }
 
-Map<String, dynamic> $PaidServiceDetailEvaluationsToJson(
-    PaidServiceDetailEvaluations entity) {
+Map<String, dynamic> $PaidServiceDetailEvaluationsToJson(PaidServiceDetailEvaluations entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['score'] = entity.score;
@@ -341,8 +314,7 @@ extension PaidServiceDetailEvaluationsExtension on PaidServiceDetailEvaluations
   }
 }
 
-PaidServiceDetailEvaluationsAccount $PaidServiceDetailEvaluationsAccountFromJson(
-    Map<String, dynamic> json) {
+PaidServiceDetailEvaluationsAccount $PaidServiceDetailEvaluationsAccountFromJson(Map<String, dynamic> json) {
   final PaidServiceDetailEvaluationsAccount paidServiceDetailEvaluationsAccount = PaidServiceDetailEvaluationsAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -359,8 +331,7 @@ PaidServiceDetailEvaluationsAccount $PaidServiceDetailEvaluationsAccountFromJson
   return paidServiceDetailEvaluationsAccount;
 }
 
-Map<String, dynamic> $PaidServiceDetailEvaluationsAccountToJson(
-    PaidServiceDetailEvaluationsAccount entity) {
+Map<String, dynamic> $PaidServiceDetailEvaluationsAccountToJson(PaidServiceDetailEvaluationsAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/paid_service_entity.g.dart

@@ -19,10 +19,8 @@ PaidServiceEntity $PaidServiceEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     paidServiceEntity.countPage = countPage;
   }
-  final List<PaidServiceList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<PaidServiceList>(e) as PaidServiceList)
-      .toList();
+  final List<PaidServiceList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PaidServiceList>(e) as PaidServiceList).toList();
   if (list != null) {
     paidServiceEntity.list = list;
   }
@@ -83,13 +81,11 @@ PaidServiceList $PaidServiceListFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     paidServiceList.liked = liked;
   }
-  final PaidServiceListMerchant? merchant = jsonConvert.convert<
-      PaidServiceListMerchant>(json['merchant']);
+  final PaidServiceListMerchant? merchant = jsonConvert.convert<PaidServiceListMerchant>(json['merchant']);
   if (merchant != null) {
     paidServiceList.merchant = merchant;
   }
-  final PaidServiceListCategory? category = jsonConvert.convert<
-      PaidServiceListCategory>(json['category']);
+  final PaidServiceListCategory? category = jsonConvert.convert<PaidServiceListCategory>(json['category']);
   if (category != null) {
     paidServiceList.category = category;
   }
@@ -132,8 +128,7 @@ extension PaidServiceListExtension on PaidServiceList {
   }
 }
 
-PaidServiceListMerchant $PaidServiceListMerchantFromJson(
-    Map<String, dynamic> json) {
+PaidServiceListMerchant $PaidServiceListMerchantFromJson(Map<String, dynamic> json) {
   final PaidServiceListMerchant paidServiceListMerchant = PaidServiceListMerchant();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -146,8 +141,7 @@ PaidServiceListMerchant $PaidServiceListMerchantFromJson(
   return paidServiceListMerchant;
 }
 
-Map<String, dynamic> $PaidServiceListMerchantToJson(
-    PaidServiceListMerchant entity) {
+Map<String, dynamic> $PaidServiceListMerchantToJson(PaidServiceListMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -165,8 +159,7 @@ extension PaidServiceListMerchantExtension on PaidServiceListMerchant {
   }
 }
 
-PaidServiceListCategory $PaidServiceListCategoryFromJson(
-    Map<String, dynamic> json) {
+PaidServiceListCategory $PaidServiceListCategoryFromJson(Map<String, dynamic> json) {
   final PaidServiceListCategory paidServiceListCategory = PaidServiceListCategory();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -183,8 +176,7 @@ PaidServiceListCategory $PaidServiceListCategoryFromJson(
   return paidServiceListCategory;
 }
 
-Map<String, dynamic> $PaidServiceListCategoryToJson(
-    PaidServiceListCategory entity) {
+Map<String, dynamic> $PaidServiceListCategoryToJson(PaidServiceListCategory entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/paid_service_pay_success_info_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/paid_service_pay_success_info_entity.dart';
 
-PaidServicePaySuccessInfoEntity $PaidServicePaySuccessInfoEntityFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoEntity $PaidServicePaySuccessInfoEntityFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoEntity paidServicePaySuccessInfoEntity = PaidServicePaySuccessInfoEntity();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -24,51 +23,42 @@ PaidServicePaySuccessInfoEntity $PaidServicePaySuccessInfoEntityFromJson(
   if (notes != null) {
     paidServicePaySuccessInfoEntity.notes = notes;
   }
-  final PaidServicePaySuccessInfoAccount? account = jsonConvert.convert<
-      PaidServicePaySuccessInfoAccount>(json['account']);
+  final PaidServicePaySuccessInfoAccount? account = jsonConvert.convert<PaidServicePaySuccessInfoAccount>(json['account']);
   if (account != null) {
     paidServicePaySuccessInfoEntity.account = account;
   }
-  final PaidServicePaySuccessInfoOrderService? orderService = jsonConvert
-      .convert<PaidServicePaySuccessInfoOrderService>(json['order_service']);
+  final PaidServicePaySuccessInfoOrderService? orderService = jsonConvert.convert<PaidServicePaySuccessInfoOrderService>(json['order_service']);
   if (orderService != null) {
     paidServicePaySuccessInfoEntity.orderService = orderService;
   }
-  final PaidServicePaySuccessInfoMerchant? merchant = jsonConvert.convert<
-      PaidServicePaySuccessInfoMerchant>(json['merchant']);
+  final PaidServicePaySuccessInfoMerchant? merchant = jsonConvert.convert<PaidServicePaySuccessInfoMerchant>(json['merchant']);
   if (merchant != null) {
     paidServicePaySuccessInfoEntity.merchant = merchant;
   }
-  final PaidServicePaySuccessInfoStaff? staff = jsonConvert.convert<
-      PaidServicePaySuccessInfoStaff>(json['staff']);
+  final PaidServicePaySuccessInfoStaff? staff = jsonConvert.convert<PaidServicePaySuccessInfoStaff>(json['staff']);
   if (staff != null) {
     paidServicePaySuccessInfoEntity.staff = staff;
   }
-  final PaidServicePaySuccessInfoOrderProducts? orderProducts = jsonConvert
-      .convert<PaidServicePaySuccessInfoOrderProducts>(json['order_products']);
+  final PaidServicePaySuccessInfoOrderProducts? orderProducts = jsonConvert.convert<PaidServicePaySuccessInfoOrderProducts>(json['order_products']);
   if (orderProducts != null) {
     paidServicePaySuccessInfoEntity.orderProducts = orderProducts;
   }
-  final PaidServicePaySuccessInfoEstate? estate = jsonConvert.convert<
-      PaidServicePaySuccessInfoEstate>(json['estate']);
+  final PaidServicePaySuccessInfoEstate? estate = jsonConvert.convert<PaidServicePaySuccessInfoEstate>(json['estate']);
   if (estate != null) {
     paidServicePaySuccessInfoEntity.estate = estate;
   }
-  final PaidServicePaySuccessInfoEstateUnit? estateUnit = jsonConvert.convert<
-      PaidServicePaySuccessInfoEstateUnit>(json['estate_unit']);
+  final PaidServicePaySuccessInfoEstateUnit? estateUnit = jsonConvert.convert<PaidServicePaySuccessInfoEstateUnit>(json['estate_unit']);
   if (estateUnit != null) {
     paidServicePaySuccessInfoEntity.estateUnit = estateUnit;
   }
-  final PaidServicePaySuccessInfoOrder? order = jsonConvert.convert<
-      PaidServicePaySuccessInfoOrder>(json['order']);
+  final PaidServicePaySuccessInfoOrder? order = jsonConvert.convert<PaidServicePaySuccessInfoOrder>(json['order']);
   if (order != null) {
     paidServicePaySuccessInfoEntity.order = order;
   }
   return paidServicePaySuccessInfoEntity;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoEntityToJson(
-    PaidServicePaySuccessInfoEntity entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoEntityToJson(PaidServicePaySuccessInfoEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['sn'] = entity.sn;
@@ -119,8 +109,7 @@ extension PaidServicePaySuccessInfoEntityExtension on PaidServicePaySuccessInfoE
   }
 }
 
-PaidServicePaySuccessInfoAccount $PaidServicePaySuccessInfoAccountFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoAccount $PaidServicePaySuccessInfoAccountFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoAccount paidServicePaySuccessInfoAccount = PaidServicePaySuccessInfoAccount();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -141,8 +130,7 @@ PaidServicePaySuccessInfoAccount $PaidServicePaySuccessInfoAccountFromJson(
   return paidServicePaySuccessInfoAccount;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoAccountToJson(
-    PaidServicePaySuccessInfoAccount entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoAccountToJson(PaidServicePaySuccessInfoAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -166,8 +154,7 @@ extension PaidServicePaySuccessInfoAccountExtension on PaidServicePaySuccessInfo
   }
 }
 
-PaidServicePaySuccessInfoOrderService $PaidServicePaySuccessInfoOrderServiceFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoOrderService $PaidServicePaySuccessInfoOrderServiceFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoOrderService paidServicePaySuccessInfoOrderService = PaidServicePaySuccessInfoOrderService();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -177,17 +164,14 @@ PaidServicePaySuccessInfoOrderService $PaidServicePaySuccessInfoOrderServiceFrom
   if (name != null) {
     paidServicePaySuccessInfoOrderService.name = name;
   }
-  final int? evaluationsAvgScore = jsonConvert.convert<int>(
-      json['evaluations_avg_score']);
+  final int? evaluationsAvgScore = jsonConvert.convert<int>(json['evaluations_avg_score']);
   if (evaluationsAvgScore != null) {
-    paidServicePaySuccessInfoOrderService.evaluationsAvgScore =
-        evaluationsAvgScore;
+    paidServicePaySuccessInfoOrderService.evaluationsAvgScore = evaluationsAvgScore;
   }
   return paidServicePaySuccessInfoOrderService;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoOrderServiceToJson(
-    PaidServicePaySuccessInfoOrderService entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoOrderServiceToJson(PaidServicePaySuccessInfoOrderService entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -208,8 +192,7 @@ extension PaidServicePaySuccessInfoOrderServiceExtension on PaidServicePaySucces
   }
 }
 
-PaidServicePaySuccessInfoMerchant $PaidServicePaySuccessInfoMerchantFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoMerchant $PaidServicePaySuccessInfoMerchantFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoMerchant paidServicePaySuccessInfoMerchant = PaidServicePaySuccessInfoMerchant();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -219,16 +202,14 @@ PaidServicePaySuccessInfoMerchant $PaidServicePaySuccessInfoMerchantFromJson(
   if (name != null) {
     paidServicePaySuccessInfoMerchant.name = name;
   }
-  final String? contactPhone = jsonConvert.convert<String>(
-      json['contact_phone']);
+  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
   if (contactPhone != null) {
     paidServicePaySuccessInfoMerchant.contactPhone = contactPhone;
   }
   return paidServicePaySuccessInfoMerchant;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoMerchantToJson(
-    PaidServicePaySuccessInfoMerchant entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoMerchantToJson(PaidServicePaySuccessInfoMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -249,8 +230,7 @@ extension PaidServicePaySuccessInfoMerchantExtension on PaidServicePaySuccessInf
   }
 }
 
-PaidServicePaySuccessInfoStaff $PaidServicePaySuccessInfoStaffFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoStaff $PaidServicePaySuccessInfoStaffFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoStaff paidServicePaySuccessInfoStaff = PaidServicePaySuccessInfoStaff();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -267,8 +247,7 @@ PaidServicePaySuccessInfoStaff $PaidServicePaySuccessInfoStaffFromJson(
   return paidServicePaySuccessInfoStaff;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoStaffToJson(
-    PaidServicePaySuccessInfoStaff entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoStaffToJson(PaidServicePaySuccessInfoStaff entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -289,8 +268,7 @@ extension PaidServicePaySuccessInfoStaffExtension on PaidServicePaySuccessInfoSt
   }
 }
 
-PaidServicePaySuccessInfoOrderProducts $PaidServicePaySuccessInfoOrderProductsFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoOrderProducts $PaidServicePaySuccessInfoOrderProductsFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoOrderProducts paidServicePaySuccessInfoOrderProducts = PaidServicePaySuccessInfoOrderProducts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -308,16 +286,14 @@ PaidServicePaySuccessInfoOrderProducts $PaidServicePaySuccessInfoOrderProductsFr
   if (totalAmount != null) {
     paidServicePaySuccessInfoOrderProducts.totalAmount = totalAmount;
   }
-  final String? plannedServiceAt = jsonConvert.convert<String>(
-      json['planned_service_at']);
+  final String? plannedServiceAt = jsonConvert.convert<String>(json['planned_service_at']);
   if (plannedServiceAt != null) {
     paidServicePaySuccessInfoOrderProducts.plannedServiceAt = plannedServiceAt;
   }
   return paidServicePaySuccessInfoOrderProducts;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoOrderProductsToJson(
-    PaidServicePaySuccessInfoOrderProducts entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoOrderProductsToJson(PaidServicePaySuccessInfoOrderProducts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['product_name'] = entity.productName;
@@ -344,8 +320,7 @@ extension PaidServicePaySuccessInfoOrderProductsExtension on PaidServicePaySucce
   }
 }
 
-PaidServicePaySuccessInfoEstate $PaidServicePaySuccessInfoEstateFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoEstate $PaidServicePaySuccessInfoEstateFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoEstate paidServicePaySuccessInfoEstate = PaidServicePaySuccessInfoEstate();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -358,8 +333,7 @@ PaidServicePaySuccessInfoEstate $PaidServicePaySuccessInfoEstateFromJson(
   return paidServicePaySuccessInfoEstate;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoEstateToJson(
-    PaidServicePaySuccessInfoEstate entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoEstateToJson(PaidServicePaySuccessInfoEstate entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -377,8 +351,7 @@ extension PaidServicePaySuccessInfoEstateExtension on PaidServicePaySuccessInfoE
   }
 }
 
-PaidServicePaySuccessInfoEstateUnit $PaidServicePaySuccessInfoEstateUnitFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoEstateUnit $PaidServicePaySuccessInfoEstateUnitFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoEstateUnit paidServicePaySuccessInfoEstateUnit = PaidServicePaySuccessInfoEstateUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -395,8 +368,7 @@ PaidServicePaySuccessInfoEstateUnit $PaidServicePaySuccessInfoEstateUnitFromJson
   return paidServicePaySuccessInfoEstateUnit;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoEstateUnitToJson(
-    PaidServicePaySuccessInfoEstateUnit entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoEstateUnitToJson(PaidServicePaySuccessInfoEstateUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['unit'] = entity.unit;
@@ -417,8 +389,7 @@ extension PaidServicePaySuccessInfoEstateUnitExtension on PaidServicePaySuccessI
   }
 }
 
-PaidServicePaySuccessInfoOrder $PaidServicePaySuccessInfoOrderFromJson(
-    Map<String, dynamic> json) {
+PaidServicePaySuccessInfoOrder $PaidServicePaySuccessInfoOrderFromJson(Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoOrder paidServicePaySuccessInfoOrder = PaidServicePaySuccessInfoOrder();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -432,8 +403,7 @@ PaidServicePaySuccessInfoOrder $PaidServicePaySuccessInfoOrderFromJson(
   if (orderAmount != null) {
     paidServicePaySuccessInfoOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(
-      json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
   if (depositAmount != null) {
     paidServicePaySuccessInfoOrder.depositAmount = depositAmount;
   }
@@ -448,8 +418,7 @@ PaidServicePaySuccessInfoOrder $PaidServicePaySuccessInfoOrderFromJson(
   return paidServicePaySuccessInfoOrder;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoOrderToJson(
-    PaidServicePaySuccessInfoOrder entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoOrderToJson(PaidServicePaySuccessInfoOrder entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['total_amount'] = entity.totalAmount;

packages/cs_domain/lib/generated/json/payment_intent_entity.g.dart

@@ -3,8 +3,7 @@ import 'package:domain/entity/payment_intent_entity.dart';
 
 PaymentIntentEntity $PaymentIntentEntityFromJson(Map<String, dynamic> json) {
   final PaymentIntentEntity paymentIntentEntity = PaymentIntentEntity();
-  final String? clientSecret = jsonConvert.convert<String>(
-      json['client_secret']);
+  final String? clientSecret = jsonConvert.convert<String>(json['client_secret']);
   if (clientSecret != null) {
     paymentIntentEntity.clientSecret = clientSecret;
   }

packages/cs_domain/lib/generated/json/payment_page_entity.g.dart

@@ -21,10 +21,8 @@ PaymentPageEntity $PaymentPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     paymentPageEntity.countPage = countPage;
   }
-  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList)
-      .toList();
+  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList).toList();
   if (list != null) {
     paymentPageEntity.list = list;
   }

packages/cs_domain/lib/generated/json/property_news_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_news_detail_entity.dart';
 
-PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(
-    Map<String, dynamic> json) {
+PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(Map<String, dynamic> json) {
   final PropertyNewsDetailEntity propertyNewsDetailEntity = PropertyNewsDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -35,8 +34,7 @@ PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(
   return propertyNewsDetailEntity;
 }
 
-Map<String, dynamic> $PropertyNewsDetailEntityToJson(
-    PropertyNewsDetailEntity entity) {
+Map<String, dynamic> $PropertyNewsDetailEntityToJson(PropertyNewsDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/property_news_entity.g.dart

@@ -19,10 +19,8 @@ PropertyNewsEntity $PropertyNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     propertyNewsEntity.countPage = countPage;
   }
-  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList)
-      .toList();
+  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList).toList();
   if (list != null) {
     propertyNewsEntity.list = list;
   }

packages/cs_domain/lib/generated/json/property_sale_rent_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_sale_rent_entity.dart';
 
-PropertySaleRentEntity $PropertySaleRentEntityFromJson(
-    Map<String, dynamic> json) {
+PropertySaleRentEntity $PropertySaleRentEntityFromJson(Map<String, dynamic> json) {
   final PropertySaleRentEntity propertySaleRentEntity = PropertySaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ PropertySaleRentEntity $PropertySaleRentEntityFromJson(
   if (countPage != null) {
     propertySaleRentEntity.countPage = countPage;
   }
-  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList)
-      .toList();
+  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList).toList();
   if (list != null) {
     propertySaleRentEntity.list = list;
   }
   return propertySaleRentEntity;
 }
 
-Map<String, dynamic> $PropertySaleRentEntityToJson(
-    PropertySaleRentEntity entity) {
+Map<String, dynamic> $PropertySaleRentEntityToJson(PropertySaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/repair_service_entity.g.dart

@@ -19,10 +19,8 @@ RepairServiceEntity $RepairServiceEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     repairServiceEntity.countPage = countPage;
   }
-  final List<RepairServiceList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<RepairServiceList>(e) as RepairServiceList)
-      .toList();
+  final List<RepairServiceList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RepairServiceList>(e) as RepairServiceList).toList();
   if (list != null) {
     repairServiceEntity.list = list;
   }
@@ -79,13 +77,11 @@ RepairServiceList $RepairServiceListFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     repairServiceList.liked = liked;
   }
-  final RepairServiceListMerchant? merchant = jsonConvert.convert<
-      RepairServiceListMerchant>(json['merchant']);
+  final RepairServiceListMerchant? merchant = jsonConvert.convert<RepairServiceListMerchant>(json['merchant']);
   if (merchant != null) {
     repairServiceList.merchant = merchant;
   }
-  final RepairServiceListCategory? category = jsonConvert.convert<
-      RepairServiceListCategory>(json['category']);
+  final RepairServiceListCategory? category = jsonConvert.convert<RepairServiceListCategory>(json['category']);
   if (category != null) {
     repairServiceList.category = category;
   }
@@ -125,8 +121,7 @@ extension RepairServiceListExtension on RepairServiceList {
   }
 }
 
-RepairServiceListMerchant $RepairServiceListMerchantFromJson(
-    Map<String, dynamic> json) {
+RepairServiceListMerchant $RepairServiceListMerchantFromJson(Map<String, dynamic> json) {
   final RepairServiceListMerchant repairServiceListMerchant = RepairServiceListMerchant();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -139,8 +134,7 @@ RepairServiceListMerchant $RepairServiceListMerchantFromJson(
   return repairServiceListMerchant;
 }
 
-Map<String, dynamic> $RepairServiceListMerchantToJson(
-    RepairServiceListMerchant entity) {
+Map<String, dynamic> $RepairServiceListMerchantToJson(RepairServiceListMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -158,8 +152,7 @@ extension RepairServiceListMerchantExtension on RepairServiceListMerchant {
   }
 }
 
-RepairServiceListCategory $RepairServiceListCategoryFromJson(
-    Map<String, dynamic> json) {
+RepairServiceListCategory $RepairServiceListCategoryFromJson(Map<String, dynamic> json) {
   final RepairServiceListCategory repairServiceListCategory = RepairServiceListCategory();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -176,8 +169,7 @@ RepairServiceListCategory $RepairServiceListCategoryFromJson(
   return repairServiceListCategory;
 }
 
-Map<String, dynamic> $RepairServiceListCategoryToJson(
-    RepairServiceListCategory entity) {
+Map<String, dynamic> $RepairServiceListCategoryToJson(RepairServiceListCategory entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/rewards_active_detail_entity.g.dart

@@ -1,19 +1,16 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_active_detail_entity.dart';
 
-RewardsActiveDetailEntity $RewardsActiveDetailEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsActiveDetailEntity $RewardsActiveDetailEntityFromJson(Map<String, dynamic> json) {
   final RewardsActiveDetailEntity rewardsActiveDetailEntity = RewardsActiveDetailEntity();
-  final RewardsActiveDetailData? data = jsonConvert.convert<
-      RewardsActiveDetailData>(json['data']);
+  final RewardsActiveDetailData? data = jsonConvert.convert<RewardsActiveDetailData>(json['data']);
   if (data != null) {
     rewardsActiveDetailEntity.data = data;
   }
   return rewardsActiveDetailEntity;
 }
 
-Map<String, dynamic> $RewardsActiveDetailEntityToJson(
-    RewardsActiveDetailEntity entity) {
+Map<String, dynamic> $RewardsActiveDetailEntityToJson(RewardsActiveDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['data'] = entity.data.toJson();
   return data;
@@ -28,15 +25,13 @@ extension RewardsActiveDetailEntityExtension on RewardsActiveDetailEntity {
   }
 }
 
-RewardsActiveDetailData $RewardsActiveDetailDataFromJson(
-    Map<String, dynamic> json) {
+RewardsActiveDetailData $RewardsActiveDetailDataFromJson(Map<String, dynamic> json) {
   final RewardsActiveDetailData rewardsActiveDetailData = RewardsActiveDetailData();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
     rewardsActiveDetailData.id = id;
   }
-  final String? redemptionCode = jsonConvert.convert<String>(
-      json['redemption_code']);
+  final String? redemptionCode = jsonConvert.convert<String>(json['redemption_code']);
   if (redemptionCode != null) {
     rewardsActiveDetailData.redemptionCode = redemptionCode;
   }
@@ -56,21 +51,18 @@ RewardsActiveDetailData $RewardsActiveDetailDataFromJson(
   if (quantity != null) {
     rewardsActiveDetailData.quantity = quantity;
   }
-  final RewardsActiveDetailDataAccount? account = jsonConvert.convert<
-      RewardsActiveDetailDataAccount>(json['account']);
+  final RewardsActiveDetailDataAccount? account = jsonConvert.convert<RewardsActiveDetailDataAccount>(json['account']);
   if (account != null) {
     rewardsActiveDetailData.account = account;
   }
-  final RewardsActiveDetailDataReward? reward = jsonConvert.convert<
-      RewardsActiveDetailDataReward>(json['reward']);
+  final RewardsActiveDetailDataReward? reward = jsonConvert.convert<RewardsActiveDetailDataReward>(json['reward']);
   if (reward != null) {
     rewardsActiveDetailData.reward = reward;
   }
   return rewardsActiveDetailData;
 }
 
-Map<String, dynamic> $RewardsActiveDetailDataToJson(
-    RewardsActiveDetailData entity) {
+Map<String, dynamic> $RewardsActiveDetailDataToJson(RewardsActiveDetailData entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['redemption_code'] = entity.redemptionCode;
@@ -106,8 +98,7 @@ extension RewardsActiveDetailDataExtension on RewardsActiveDetailData {
   }
 }
 
-RewardsActiveDetailDataAccount $RewardsActiveDetailDataAccountFromJson(
-    Map<String, dynamic> json) {
+RewardsActiveDetailDataAccount $RewardsActiveDetailDataAccountFromJson(Map<String, dynamic> json) {
   final RewardsActiveDetailDataAccount rewardsActiveDetailDataAccount = RewardsActiveDetailDataAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -124,8 +115,7 @@ RewardsActiveDetailDataAccount $RewardsActiveDetailDataAccountFromJson(
   return rewardsActiveDetailDataAccount;
 }
 
-Map<String, dynamic> $RewardsActiveDetailDataAccountToJson(
-    RewardsActiveDetailDataAccount entity) {
+Map<String, dynamic> $RewardsActiveDetailDataAccountToJson(RewardsActiveDetailDataAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -146,8 +136,7 @@ extension RewardsActiveDetailDataAccountExtension on RewardsActiveDetailDataAcco
   }
 }
 
-RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(
-    Map<String, dynamic> json) {
+RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(Map<String, dynamic> json) {
   final RewardsActiveDetailDataReward rewardsActiveDetailDataReward = RewardsActiveDetailDataReward();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -170,8 +159,7 @@ RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(
   if (point != null) {
     rewardsActiveDetailDataReward.point = point;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(
-      json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsActiveDetailDataReward.redeemedStart = redeemedStart;
   }
@@ -182,8 +170,7 @@ RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(
   return rewardsActiveDetailDataReward;
 }
 
-Map<String, dynamic> $RewardsActiveDetailDataRewardToJson(
-    RewardsActiveDetailDataReward entity) {
+Map<String, dynamic> $RewardsActiveDetailDataRewardToJson(RewardsActiveDetailDataReward entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/rewards_buy_entity.g.dart

@@ -11,8 +11,7 @@ RewardsBuyEntity $RewardsBuyEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     rewardsBuyEntity.createdAt = createdAt;
   }
-  final RewardsBuyReward? reward = jsonConvert.convert<RewardsBuyReward>(
-      json['reward']);
+  final RewardsBuyReward? reward = jsonConvert.convert<RewardsBuyReward>(json['reward']);
   if (reward != null) {
     rewardsBuyEntity.reward = reward;
   }
@@ -79,8 +78,7 @@ RewardsBuyReward $RewardsBuyRewardFromJson(Map<String, dynamic> json) {
   if (end != null) {
     rewardsBuyReward.end = end;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(
-      json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsBuyReward.redeemedStart = redeemedStart;
   }
@@ -100,12 +98,8 @@ RewardsBuyReward $RewardsBuyRewardFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     rewardsBuyReward.createdAt = createdAt;
   }
-  final List<
-      RewardsBuyRewardRedeemable>? redeemable = (json['redeemable'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<RewardsBuyRewardRedeemable>(
-          e) as RewardsBuyRewardRedeemable).toList();
+  final List<RewardsBuyRewardRedeemable>? redeemable = (json['redeemable'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsBuyRewardRedeemable>(e) as RewardsBuyRewardRedeemable).toList();
   if (redeemable != null) {
     rewardsBuyReward.redeemable = redeemable;
   }
@@ -169,8 +163,7 @@ extension RewardsBuyRewardExtension on RewardsBuyReward {
   }
 }
 
-RewardsBuyRewardRedeemable $RewardsBuyRewardRedeemableFromJson(
-    Map<String, dynamic> json) {
+RewardsBuyRewardRedeemable $RewardsBuyRewardRedeemableFromJson(Map<String, dynamic> json) {
   final RewardsBuyRewardRedeemable rewardsBuyRewardRedeemable = RewardsBuyRewardRedeemable();
   final String? day = jsonConvert.convert<String>(json['day']);
   if (day != null) {
@@ -183,8 +176,7 @@ RewardsBuyRewardRedeemable $RewardsBuyRewardRedeemableFromJson(
   return rewardsBuyRewardRedeemable;
 }
 
-Map<String, dynamic> $RewardsBuyRewardRedeemableToJson(
-    RewardsBuyRewardRedeemable entity) {
+Map<String, dynamic> $RewardsBuyRewardRedeemableToJson(RewardsBuyRewardRedeemable entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['day'] = entity.day;
   data['time'] = entity.time;

packages/cs_domain/lib/generated/json/rewards_category_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_category_entity.dart';
 
-RewardsCategoryEntity $RewardsCategoryEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsCategoryEntity $RewardsCategoryEntityFromJson(Map<String, dynamic> json) {
   final RewardsCategoryEntity rewardsCategoryEntity = RewardsCategoryEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,8 +18,7 @@ RewardsCategoryEntity $RewardsCategoryEntityFromJson(
   return rewardsCategoryEntity;
 }
 
-Map<String, dynamic> $RewardsCategoryEntityToJson(
-    RewardsCategoryEntity entity) {
+Map<String, dynamic> $RewardsCategoryEntityToJson(RewardsCategoryEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;

packages/cs_domain/lib/generated/json/rewards_detail_entity.g.dart

@@ -40,8 +40,7 @@ RewardsDetailEntity $RewardsDetailEntityFromJson(Map<String, dynamic> json) {
   if (end != null) {
     rewardsDetailEntity.end = end;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(
-      json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsDetailEntity.redeemedStart = redeemedStart;
   }
@@ -61,11 +60,8 @@ RewardsDetailEntity $RewardsDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     rewardsDetailEntity.createdAt = createdAt;
   }
-  final List<RewardsDetailRedeemable>? redeemable = (json['redeemable'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<RewardsDetailRedeemable>(
-          e) as RewardsDetailRedeemable).toList();
+  final List<RewardsDetailRedeemable>? redeemable = (json['redeemable'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsDetailRedeemable>(e) as RewardsDetailRedeemable).toList();
   if (redeemable != null) {
     rewardsDetailEntity.redeemable = redeemable;
   }
@@ -129,8 +125,7 @@ extension RewardsDetailEntityExtension on RewardsDetailEntity {
   }
 }
 
-RewardsDetailRedeemable $RewardsDetailRedeemableFromJson(
-    Map<String, dynamic> json) {
+RewardsDetailRedeemable $RewardsDetailRedeemableFromJson(Map<String, dynamic> json) {
   final RewardsDetailRedeemable rewardsDetailRedeemable = RewardsDetailRedeemable();
   final String? day = jsonConvert.convert<String>(json['day']);
   if (day != null) {
@@ -143,8 +138,7 @@ RewardsDetailRedeemable $RewardsDetailRedeemableFromJson(
   return rewardsDetailRedeemable;
 }
 
-Map<String, dynamic> $RewardsDetailRedeemableToJson(
-    RewardsDetailRedeemable entity) {
+Map<String, dynamic> $RewardsDetailRedeemableToJson(RewardsDetailRedeemable entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['day'] = entity.day;
   data['time'] = entity.time;

packages/cs_domain/lib/generated/json/rewards_history_earned_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_history_earned_entity.dart';
 
-RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(Map<String, dynamic> json) {
   final RewardsHistoryEarnedEntity rewardsHistoryEarnedEntity = RewardsHistoryEarnedEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,20 +19,15 @@ RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(
   if (countPage != null) {
     rewardsHistoryEarnedEntity.countPage = countPage;
   }
-  final List<RewardsHistoryEarnedList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<RewardsHistoryEarnedList>(
-          e) as RewardsHistoryEarnedList)
-      .toList();
+  final List<RewardsHistoryEarnedList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsHistoryEarnedList>(e) as RewardsHistoryEarnedList).toList();
   if (list != null) {
     rewardsHistoryEarnedEntity.list = list;
   }
   return rewardsHistoryEarnedEntity;
 }
 
-Map<String, dynamic> $RewardsHistoryEarnedEntityToJson(
-    RewardsHistoryEarnedEntity entity) {
+Map<String, dynamic> $RewardsHistoryEarnedEntityToJson(RewardsHistoryEarnedEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -60,8 +54,7 @@ extension RewardsHistoryEarnedEntityExtension on RewardsHistoryEarnedEntity {
   }
 }
 
-RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(
-    Map<String, dynamic> json) {
+RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(Map<String, dynamic> json) {
   final RewardsHistoryEarnedList rewardsHistoryEarnedList = RewardsHistoryEarnedList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -71,8 +64,7 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(
   if (point != null) {
     rewardsHistoryEarnedList.point = point;
   }
-  final String? shortDescription = jsonConvert.convert<String>(
-      json['short_description']);
+  final String? shortDescription = jsonConvert.convert<String>(json['short_description']);
   if (shortDescription != null) {
     rewardsHistoryEarnedList.shortDescription = shortDescription;
   }
@@ -83,8 +75,7 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(
   return rewardsHistoryEarnedList;
 }
 
-Map<String, dynamic> $RewardsHistoryEarnedListToJson(
-    RewardsHistoryEarnedList entity) {
+Map<String, dynamic> $RewardsHistoryEarnedListToJson(RewardsHistoryEarnedList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['point'] = entity.point;

packages/cs_domain/lib/generated/json/rewards_home_entity.g.dart

@@ -3,10 +3,8 @@ import 'package:domain/entity/rewards_home_entity.dart';
 
 RewardsHomeEntity $RewardsHomeEntityFromJson(Map<String, dynamic> json) {
   final RewardsHomeEntity rewardsHomeEntity = RewardsHomeEntity();
-  final List<RewardsHomeData>? data = (json['data'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<RewardsHomeData>(e) as RewardsHomeData)
-      .toList();
+  final List<RewardsHomeData>? data = (json['data'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsHomeData>(e) as RewardsHomeData).toList();
   if (data != null) {
     rewardsHomeEntity.data = data;
   }
@@ -52,12 +50,8 @@ RewardsHomeData $RewardsHomeDataFromJson(Map<String, dynamic> json) {
   if (name != null) {
     rewardsHomeData.name = name;
   }
-  final List<RewardsHomeDataRewards>? rewards = (json['rewards'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<RewardsHomeDataRewards>(e) as RewardsHomeDataRewards)
-      .toList();
+  final List<RewardsHomeDataRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsHomeDataRewards>(e) as RewardsHomeDataRewards).toList();
   if (rewards != null) {
     rewardsHomeData.rewards = rewards;
   }
@@ -85,8 +79,7 @@ extension RewardsHomeDataExtension on RewardsHomeData {
   }
 }
 
-RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(
-    Map<String, dynamic> json) {
+RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(Map<String, dynamic> json) {
   final RewardsHomeDataRewards rewardsHomeDataRewards = RewardsHomeDataRewards();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -112,8 +105,7 @@ RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(
   return rewardsHomeDataRewards;
 }
 
-Map<String, dynamic> $RewardsHomeDataRewardsToJson(
-    RewardsHomeDataRewards entity) {
+Map<String, dynamic> $RewardsHomeDataRewardsToJson(RewardsHomeDataRewards entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/rewards_home_tes_entity.g.dart

@@ -11,12 +11,8 @@ RewardsHomeTesEntity $RewardsHomeTesEntityFromJson(Map<String, dynamic> json) {
   if (name != null) {
     rewardsHomeTesEntity.name = name;
   }
-  final List<RewardsHomeTesRewards>? rewards = (json['rewards'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<RewardsHomeTesRewards>(e) as RewardsHomeTesRewards)
-      .toList();
+  final List<RewardsHomeTesRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsHomeTesRewards>(e) as RewardsHomeTesRewards).toList();
   if (rewards != null) {
     rewardsHomeTesEntity.rewards = rewards;
   }
@@ -44,8 +40,7 @@ extension RewardsHomeTesEntityExtension on RewardsHomeTesEntity {
   }
 }
 
-RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(
-    Map<String, dynamic> json) {
+RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(Map<String, dynamic> json) {
   final RewardsHomeTesRewards rewardsHomeTesRewards = RewardsHomeTesRewards();
   final double? id = jsonConvert.convert<double>(json['id']);
   if (id != null) {
@@ -60,8 +55,7 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(
   if (resources != null) {
     rewardsHomeTesRewards.resources = resources;
   }
-  final double? originalPoint = jsonConvert.convert<double>(
-      json['original_point']);
+  final double? originalPoint = jsonConvert.convert<double>(json['original_point']);
   if (originalPoint != null) {
     rewardsHomeTesRewards.originalPoint = originalPoint;
   }
@@ -72,8 +66,7 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(
   return rewardsHomeTesRewards;
 }
 
-Map<String, dynamic> $RewardsHomeTesRewardsToJson(
-    RewardsHomeTesRewards entity) {
+Map<String, dynamic> $RewardsHomeTesRewardsToJson(RewardsHomeTesRewards entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/rewards_home_test_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_home_test_entity.dart';
 
-RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(Map<String, dynamic> json) {
   final RewardsHomeTestEntity rewardsHomeTestEntity = RewardsHomeTestEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -20,8 +19,7 @@ RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(
   return rewardsHomeTestEntity;
 }
 
-Map<String, dynamic> $RewardsHomeTestEntityToJson(
-    RewardsHomeTestEntity entity) {
+Map<String, dynamic> $RewardsHomeTestEntityToJson(RewardsHomeTestEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/rewards_index_entity.g.dart

@@ -7,13 +7,11 @@ RewardsIndexEntity $RewardsIndexEntityFromJson(Map<String, dynamic> json) {
   if (points != null) {
     rewardsIndexEntity.points = points;
   }
-  final RewardsIndexContinuous? continuous = jsonConvert.convert<
-      RewardsIndexContinuous>(json['continuous']);
+  final RewardsIndexContinuous? continuous = jsonConvert.convert<RewardsIndexContinuous>(json['continuous']);
   if (continuous != null) {
     rewardsIndexEntity.continuous = continuous;
   }
-  final RewardsIndexTasks? tasks = jsonConvert.convert<RewardsIndexTasks>(
-      json['tasks']);
+  final RewardsIndexTasks? tasks = jsonConvert.convert<RewardsIndexTasks>(json['tasks']);
   if (tasks != null) {
     rewardsIndexEntity.tasks = tasks;
   }
@@ -49,16 +47,13 @@ extension RewardsIndexEntityExtension on RewardsIndexEntity {
   }
 }
 
-RewardsIndexContinuous $RewardsIndexContinuousFromJson(
-    Map<String, dynamic> json) {
+RewardsIndexContinuous $RewardsIndexContinuousFromJson(Map<String, dynamic> json) {
   final RewardsIndexContinuous rewardsIndexContinuous = RewardsIndexContinuous();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
     rewardsIndexContinuous.count = count;
   }
-  final List<
-      dynamic>? currentWeekCheckin = (json['current_week_checkin'] as List<
-      dynamic>?)?.map(
+  final List<dynamic>? currentWeekCheckin = (json['current_week_checkin'] as List<dynamic>?)?.map(
           (e) => e).toList();
   if (currentWeekCheckin != null) {
     rewardsIndexContinuous.currentWeekCheckin = currentWeekCheckin;
@@ -66,8 +61,7 @@ RewardsIndexContinuous $RewardsIndexContinuousFromJson(
   return rewardsIndexContinuous;
 }
 
-Map<String, dynamic> $RewardsIndexContinuousToJson(
-    RewardsIndexContinuous entity) {
+Map<String, dynamic> $RewardsIndexContinuousToJson(RewardsIndexContinuous entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['current_week_checkin'] = entity.currentWeekCheckin;

packages/cs_domain/lib/generated/json/rewards_list_entity.g.dart

@@ -19,10 +19,8 @@ RewardsListEntity $RewardsListEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     rewardsListEntity.countPage = countPage;
   }
-  final List<RewardsListList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<RewardsListList>(e) as RewardsListList)
-      .toList();
+  final List<RewardsListList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsListList>(e) as RewardsListList).toList();
   if (list != null) {
     rewardsListEntity.list = list;
   }

packages/cs_domain/lib/generated/json/rewards_my_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_my_detail_entity.dart';
 
-RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(Map<String, dynamic> json) {
   final RewardsMyDetailEntity rewardsMyDetailEntity = RewardsMyDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -28,21 +27,18 @@ RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(
   if (quantity != null) {
     rewardsMyDetailEntity.quantity = quantity;
   }
-  final RewardsMyDetailReward? reward = jsonConvert.convert<
-      RewardsMyDetailReward>(json['reward']);
+  final RewardsMyDetailReward? reward = jsonConvert.convert<RewardsMyDetailReward>(json['reward']);
   if (reward != null) {
     rewardsMyDetailEntity.reward = reward;
   }
-  final RewardsMyDetailAccount? account = jsonConvert.convert<
-      RewardsMyDetailAccount>(json['account']);
+  final RewardsMyDetailAccount? account = jsonConvert.convert<RewardsMyDetailAccount>(json['account']);
   if (account != null) {
     rewardsMyDetailEntity.account = account;
   }
   return rewardsMyDetailEntity;
 }
 
-Map<String, dynamic> $RewardsMyDetailEntityToJson(
-    RewardsMyDetailEntity entity) {
+Map<String, dynamic> $RewardsMyDetailEntityToJson(RewardsMyDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['redemption_code'] = entity.redemptionCode;
@@ -78,8 +74,7 @@ extension RewardsMyDetailEntityExtension on RewardsMyDetailEntity {
   }
 }
 
-RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(
-    Map<String, dynamic> json) {
+RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(Map<String, dynamic> json) {
   final RewardsMyDetailAccount rewardsMyDetailAccount = RewardsMyDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -96,8 +91,7 @@ RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(
   return rewardsMyDetailAccount;
 }
 
-Map<String, dynamic> $RewardsMyDetailAccountToJson(
-    RewardsMyDetailAccount entity) {
+Map<String, dynamic> $RewardsMyDetailAccountToJson(RewardsMyDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -118,8 +112,7 @@ extension RewardsMyDetailAccountExtension on RewardsMyDetailAccount {
   }
 }
 
-RewardsMyDetailReward $RewardsMyDetailRewardFromJson(
-    Map<String, dynamic> json) {
+RewardsMyDetailReward $RewardsMyDetailRewardFromJson(Map<String, dynamic> json) {
   final RewardsMyDetailReward rewardsMyDetailReward = RewardsMyDetailReward();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -142,8 +135,7 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(
   if (point != null) {
     rewardsMyDetailReward.point = point;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(
-      json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsMyDetailReward.redeemedStart = redeemedStart;
   }
@@ -154,8 +146,7 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(
   return rewardsMyDetailReward;
 }
 
-Map<String, dynamic> $RewardsMyDetailRewardToJson(
-    RewardsMyDetailReward entity) {
+Map<String, dynamic> $RewardsMyDetailRewardToJson(RewardsMyDetailReward entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/rewards_my_entity.g.dart

@@ -19,10 +19,8 @@ RewardsMyEntity $RewardsMyEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     rewardsMyEntity.countPage = countPage;
   }
-  final List<RewardsMyList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<RewardsMyList>(e) as RewardsMyList)
-      .toList();
+  final List<RewardsMyList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsMyList>(e) as RewardsMyList).toList();
   if (list != null) {
     rewardsMyEntity.list = list;
   }
@@ -70,8 +68,7 @@ RewardsMyList $RewardsMyListFromJson(Map<String, dynamic> json) {
   if (usedAt != null) {
     rewardsMyList.usedAt = usedAt;
   }
-  final RewardsMyListReward? reward = jsonConvert.convert<RewardsMyListReward>(
-      json['reward']);
+  final RewardsMyListReward? reward = jsonConvert.convert<RewardsMyListReward>(json['reward']);
   if (reward != null) {
     rewardsMyList.reward = reward;
   }
@@ -125,8 +122,7 @@ RewardsMyListReward $RewardsMyListRewardFromJson(Map<String, dynamic> json) {
   if (point != null) {
     rewardsMyListReward.point = point;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(
-      json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsMyListReward.redeemedStart = redeemedStart;
   }

packages/cs_domain/lib/generated/json/rewards_search_entity.g.dart

@@ -13,12 +13,8 @@ RewardsSearchEntity $RewardsSearchEntityFromJson(Map<String, dynamic> json) {
   if (trending != null) {
     rewardsSearchEntity.trending = trending;
   }
-  final List<RewardsSearchRewards>? rewards = (json['rewards'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<RewardsSearchRewards>(e) as RewardsSearchRewards)
-      .toList();
+  final List<RewardsSearchRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsSearchRewards>(e) as RewardsSearchRewards).toList();
   if (rewards != null) {
     rewardsSearchEntity.rewards = rewards;
   }

packages/cs_domain/lib/generated/json/service_category_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_category_entity.dart';
 
-ServiceCategoryEntity $ServiceCategoryEntityFromJson(
-    Map<String, dynamic> json) {
+ServiceCategoryEntity $ServiceCategoryEntityFromJson(Map<String, dynamic> json) {
   final ServiceCategoryEntity serviceCategoryEntity = ServiceCategoryEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -23,8 +22,7 @@ ServiceCategoryEntity $ServiceCategoryEntityFromJson(
   return serviceCategoryEntity;
 }
 
-Map<String, dynamic> $ServiceCategoryEntityToJson(
-    ServiceCategoryEntity entity) {
+Map<String, dynamic> $ServiceCategoryEntityToJson(ServiceCategoryEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/service_evaluate_list_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_evaluate_list_entity.dart';
 
-ServiceEvaluateListEntity $ServiceEvaluateListEntityFromJson(
-    Map<String, dynamic> json) {
+ServiceEvaluateListEntity $ServiceEvaluateListEntityFromJson(Map<String, dynamic> json) {
   final ServiceEvaluateListEntity serviceEvaluateListEntity = ServiceEvaluateListEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,20 +19,15 @@ ServiceEvaluateListEntity $ServiceEvaluateListEntityFromJson(
   if (countPage != null) {
     serviceEvaluateListEntity.countPage = countPage;
   }
-  final List<ServiceEvaluateListList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<ServiceEvaluateListList>(
-          e) as ServiceEvaluateListList)
-      .toList();
+  final List<ServiceEvaluateListList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<ServiceEvaluateListList>(e) as ServiceEvaluateListList).toList();
   if (list != null) {
     serviceEvaluateListEntity.list = list;
   }
   return serviceEvaluateListEntity;
 }
 
-Map<String, dynamic> $ServiceEvaluateListEntityToJson(
-    ServiceEvaluateListEntity entity) {
+Map<String, dynamic> $ServiceEvaluateListEntityToJson(ServiceEvaluateListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -60,15 +54,13 @@ extension ServiceEvaluateListEntityExtension on ServiceEvaluateListEntity {
   }
 }
 
-ServiceEvaluateListList $ServiceEvaluateListListFromJson(
-    Map<String, dynamic> json) {
+ServiceEvaluateListList $ServiceEvaluateListListFromJson(Map<String, dynamic> json) {
   final ServiceEvaluateListList serviceEvaluateListList = ServiceEvaluateListList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
     serviceEvaluateListList.id = id;
   }
-  final ServiceEvaluateListListAccount? account = jsonConvert.convert<
-      ServiceEvaluateListListAccount>(json['account']);
+  final ServiceEvaluateListListAccount? account = jsonConvert.convert<ServiceEvaluateListListAccount>(json['account']);
   if (account != null) {
     serviceEvaluateListList.account = account;
   }
@@ -92,8 +84,7 @@ ServiceEvaluateListList $ServiceEvaluateListListFromJson(
   return serviceEvaluateListList;
 }
 
-Map<String, dynamic> $ServiceEvaluateListListToJson(
-    ServiceEvaluateListList entity) {
+Map<String, dynamic> $ServiceEvaluateListListToJson(ServiceEvaluateListList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['account'] = entity.account.toJson();
@@ -123,8 +114,7 @@ extension ServiceEvaluateListListExtension on ServiceEvaluateListList {
   }
 }
 
-ServiceEvaluateListListAccount $ServiceEvaluateListListAccountFromJson(
-    Map<String, dynamic> json) {
+ServiceEvaluateListListAccount $ServiceEvaluateListListAccountFromJson(Map<String, dynamic> json) {
   final ServiceEvaluateListListAccount serviceEvaluateListListAccount = ServiceEvaluateListListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -141,8 +131,7 @@ ServiceEvaluateListListAccount $ServiceEvaluateListListAccountFromJson(
   return serviceEvaluateListListAccount;
 }
 
-Map<String, dynamic> $ServiceEvaluateListListAccountToJson(
-    ServiceEvaluateListListAccount entity) {
+Map<String, dynamic> $ServiceEvaluateListListAccountToJson(ServiceEvaluateListListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/service_in_progress_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_in_progress_entity.dart';
 
-ServiceInProgressEntity $ServiceInProgressEntityFromJson(
-    Map<String, dynamic> json) {
+ServiceInProgressEntity $ServiceInProgressEntityFromJson(Map<String, dynamic> json) {
   final ServiceInProgressEntity serviceInProgressEntity = ServiceInProgressEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ ServiceInProgressEntity $ServiceInProgressEntityFromJson(
   if (countPage != null) {
     serviceInProgressEntity.countPage = countPage;
   }
-  final List<ServiceInProgressList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<ServiceInProgressList>(e) as ServiceInProgressList)
-      .toList();
+  final List<ServiceInProgressList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<ServiceInProgressList>(e) as ServiceInProgressList).toList();
   if (list != null) {
     serviceInProgressEntity.list = list;
   }
   return serviceInProgressEntity;
 }
 
-Map<String, dynamic> $ServiceInProgressEntityToJson(
-    ServiceInProgressEntity entity) {
+Map<String, dynamic> $ServiceInProgressEntityToJson(ServiceInProgressEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -59,8 +54,7 @@ extension ServiceInProgressEntityExtension on ServiceInProgressEntity {
   }
 }
 
-ServiceInProgressList $ServiceInProgressListFromJson(
-    Map<String, dynamic> json) {
+ServiceInProgressList $ServiceInProgressListFromJson(Map<String, dynamic> json) {
   final ServiceInProgressList serviceInProgressList = ServiceInProgressList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -74,8 +68,7 @@ ServiceInProgressList $ServiceInProgressListFromJson(
   if (userNotes != null) {
     serviceInProgressList.userNotes = userNotes;
   }
-  final String? merchantNotes = jsonConvert.convert<String>(
-      json['merchant_notes']);
+  final String? merchantNotes = jsonConvert.convert<String>(json['merchant_notes']);
   if (merchantNotes != null) {
     serviceInProgressList.merchantNotes = merchantNotes;
   }
@@ -83,13 +76,11 @@ ServiceInProgressList $ServiceInProgressListFromJson(
   if (orderStatus != null) {
     serviceInProgressList.orderStatus = orderStatus;
   }
-  final ServiceInProgressListService? service = jsonConvert.convert<
-      ServiceInProgressListService>(json['service']);
+  final ServiceInProgressListService? service = jsonConvert.convert<ServiceInProgressListService>(json['service']);
   if (service != null) {
     serviceInProgressList.service = service;
   }
-  final ServiceInProgressListMerchant? merchant = jsonConvert.convert<
-      ServiceInProgressListMerchant>(json['merchant']);
+  final ServiceInProgressListMerchant? merchant = jsonConvert.convert<ServiceInProgressListMerchant>(json['merchant']);
   if (merchant != null) {
     serviceInProgressList.merchant = merchant;
   }
@@ -100,8 +91,7 @@ ServiceInProgressList $ServiceInProgressListFromJson(
   return serviceInProgressList;
 }
 
-Map<String, dynamic> $ServiceInProgressListToJson(
-    ServiceInProgressList entity) {
+Map<String, dynamic> $ServiceInProgressListToJson(ServiceInProgressList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['sn'] = entity.sn;
@@ -137,8 +127,7 @@ extension ServiceInProgressListExtension on ServiceInProgressList {
   }
 }
 
-ServiceInProgressListService $ServiceInProgressListServiceFromJson(
-    Map<String, dynamic> json) {
+ServiceInProgressListService $ServiceInProgressListServiceFromJson(Map<String, dynamic> json) {
   final ServiceInProgressListService serviceInProgressListService = ServiceInProgressListService();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -151,8 +140,7 @@ ServiceInProgressListService $ServiceInProgressListServiceFromJson(
   return serviceInProgressListService;
 }
 
-Map<String, dynamic> $ServiceInProgressListServiceToJson(
-    ServiceInProgressListService entity) {
+Map<String, dynamic> $ServiceInProgressListServiceToJson(ServiceInProgressListService entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -170,8 +158,7 @@ extension ServiceInProgressListServiceExtension on ServiceInProgressListService
   }
 }
 
-ServiceInProgressListMerchant $ServiceInProgressListMerchantFromJson(
-    Map<String, dynamic> json) {
+ServiceInProgressListMerchant $ServiceInProgressListMerchantFromJson(Map<String, dynamic> json) {
   final ServiceInProgressListMerchant serviceInProgressListMerchant = ServiceInProgressListMerchant();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -181,16 +168,14 @@ ServiceInProgressListMerchant $ServiceInProgressListMerchantFromJson(
   if (name != null) {
     serviceInProgressListMerchant.name = name;
   }
-  final String? contactPhone = jsonConvert.convert<String>(
-      json['contact_phone']);
+  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
   if (contactPhone != null) {
     serviceInProgressListMerchant.contactPhone = contactPhone;
   }
   return serviceInProgressListMerchant;
 }
 
-Map<String, dynamic> $ServiceInProgressListMerchantToJson(
-    ServiceInProgressListMerchant entity) {
+Map<String, dynamic> $ServiceInProgressListMerchantToJson(ServiceInProgressListMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/service_order_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_order_detail_entity.dart';
 
-ServiceOrderDetailEntity $ServiceOrderDetailEntityFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailEntity $ServiceOrderDetailEntityFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailEntity serviceOrderDetailEntity = ServiceOrderDetailEntity();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -24,50 +23,39 @@ ServiceOrderDetailEntity $ServiceOrderDetailEntityFromJson(
   if (notes != null) {
     serviceOrderDetailEntity.notes = notes;
   }
-  final ServiceOrderDetailAccount? account = jsonConvert.convert<
-      ServiceOrderDetailAccount>(json['account']);
+  final ServiceOrderDetailAccount? account = jsonConvert.convert<ServiceOrderDetailAccount>(json['account']);
   if (account != null) {
     serviceOrderDetailEntity.account = account;
   }
-  final ServiceOrderDetailOrderService? orderService = jsonConvert.convert<
-      ServiceOrderDetailOrderService>(json['order_service']);
+  final ServiceOrderDetailOrderService? orderService = jsonConvert.convert<ServiceOrderDetailOrderService>(json['order_service']);
   if (orderService != null) {
     serviceOrderDetailEntity.orderService = orderService;
   }
-  final ServiceOrderDetailMerchant? merchant = jsonConvert.convert<
-      ServiceOrderDetailMerchant>(json['merchant']);
+  final ServiceOrderDetailMerchant? merchant = jsonConvert.convert<ServiceOrderDetailMerchant>(json['merchant']);
   if (merchant != null) {
     serviceOrderDetailEntity.merchant = merchant;
   }
-  final ServiceOrderDetailStaff? staff = jsonConvert.convert<
-      ServiceOrderDetailStaff>(json['staff']);
+  final ServiceOrderDetailStaff? staff = jsonConvert.convert<ServiceOrderDetailStaff>(json['staff']);
   if (staff != null) {
     serviceOrderDetailEntity.staff = staff;
   }
-  final List<
-      ServiceOrderDetailOrderProducts>? orderProducts = (json['order_products'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<ServiceOrderDetailOrderProducts>(
-          e) as ServiceOrderDetailOrderProducts).toList();
+  final List<ServiceOrderDetailOrderProducts>? orderProducts = (json['order_products'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<ServiceOrderDetailOrderProducts>(e) as ServiceOrderDetailOrderProducts).toList();
   if (orderProducts != null) {
     serviceOrderDetailEntity.orderProducts = orderProducts;
   }
-  final ServiceOrderDetailEstate? estate = jsonConvert.convert<
-      ServiceOrderDetailEstate>(json['estate']);
+  final ServiceOrderDetailEstate? estate = jsonConvert.convert<ServiceOrderDetailEstate>(json['estate']);
   if (estate != null) {
     serviceOrderDetailEntity.estate = estate;
   }
-  final ServiceOrderDetailEstateUnit? estateUnit = jsonConvert.convert<
-      ServiceOrderDetailEstateUnit>(json['estate_unit']);
+  final ServiceOrderDetailEstateUnit? estateUnit = jsonConvert.convert<ServiceOrderDetailEstateUnit>(json['estate_unit']);
   if (estateUnit != null) {
     serviceOrderDetailEntity.estateUnit = estateUnit;
   }
   return serviceOrderDetailEntity;
 }
 
-Map<String, dynamic> $ServiceOrderDetailEntityToJson(
-    ServiceOrderDetailEntity entity) {
+Map<String, dynamic> $ServiceOrderDetailEntityToJson(ServiceOrderDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['sn'] = entity.sn;
@@ -78,8 +66,7 @@ Map<String, dynamic> $ServiceOrderDetailEntityToJson(
   data['order_service'] = entity.orderService?.toJson();
   data['merchant'] = entity.merchant?.toJson();
   data['staff'] = entity.staff?.toJson();
-  data['order_products'] =
-      entity.orderProducts?.map((v) => v.toJson()).toList();
+  data['order_products'] = entity.orderProducts?.map((v) => v.toJson()).toList();
   data['estate'] = entity.estate?.toJson();
   data['estate_unit'] = entity.estateUnit?.toJson();
   return data;
@@ -116,8 +103,7 @@ extension ServiceOrderDetailEntityExtension on ServiceOrderDetailEntity {
   }
 }
 
-ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailAccount serviceOrderDetailAccount = ServiceOrderDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -138,8 +124,7 @@ ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(
   return serviceOrderDetailAccount;
 }
 
-Map<String, dynamic> $ServiceOrderDetailAccountToJson(
-    ServiceOrderDetailAccount entity) {
+Map<String, dynamic> $ServiceOrderDetailAccountToJson(ServiceOrderDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -163,8 +148,7 @@ extension ServiceOrderDetailAccountExtension on ServiceOrderDetailAccount {
   }
 }
 
-ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailOrderService serviceOrderDetailOrderService = ServiceOrderDetailOrderService();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -174,16 +158,14 @@ ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(
   if (name != null) {
     serviceOrderDetailOrderService.name = name;
   }
-  final double? evaluationsAvgScore = jsonConvert.convert<double>(
-      json['evaluations_avg_score']);
+  final double? evaluationsAvgScore = jsonConvert.convert<double>(json['evaluations_avg_score']);
   if (evaluationsAvgScore != null) {
     serviceOrderDetailOrderService.evaluationsAvgScore = evaluationsAvgScore;
   }
   return serviceOrderDetailOrderService;
 }
 
-Map<String, dynamic> $ServiceOrderDetailOrderServiceToJson(
-    ServiceOrderDetailOrderService entity) {
+Map<String, dynamic> $ServiceOrderDetailOrderServiceToJson(ServiceOrderDetailOrderService entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -204,8 +186,7 @@ extension ServiceOrderDetailOrderServiceExtension on ServiceOrderDetailOrderServ
   }
 }
 
-ServiceOrderDetailMerchant $ServiceOrderDetailMerchantFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailMerchant $ServiceOrderDetailMerchantFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailMerchant serviceOrderDetailMerchant = ServiceOrderDetailMerchant();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -215,16 +196,14 @@ ServiceOrderDetailMerchant $ServiceOrderDetailMerchantFromJson(
   if (name != null) {
     serviceOrderDetailMerchant.name = name;
   }
-  final String? contactPhone = jsonConvert.convert<String>(
-      json['contact_phone']);
+  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
   if (contactPhone != null) {
     serviceOrderDetailMerchant.contactPhone = contactPhone;
   }
   return serviceOrderDetailMerchant;
 }
 
-Map<String, dynamic> $ServiceOrderDetailMerchantToJson(
-    ServiceOrderDetailMerchant entity) {
+Map<String, dynamic> $ServiceOrderDetailMerchantToJson(ServiceOrderDetailMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -245,8 +224,7 @@ extension ServiceOrderDetailMerchantExtension on ServiceOrderDetailMerchant {
   }
 }
 
-ServiceOrderDetailStaff $ServiceOrderDetailStaffFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailStaff $ServiceOrderDetailStaffFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailStaff serviceOrderDetailStaff = ServiceOrderDetailStaff();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -263,8 +241,7 @@ ServiceOrderDetailStaff $ServiceOrderDetailStaffFromJson(
   return serviceOrderDetailStaff;
 }
 
-Map<String, dynamic> $ServiceOrderDetailStaffToJson(
-    ServiceOrderDetailStaff entity) {
+Map<String, dynamic> $ServiceOrderDetailStaffToJson(ServiceOrderDetailStaff entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -285,8 +262,7 @@ extension ServiceOrderDetailStaffExtension on ServiceOrderDetailStaff {
   }
 }
 
-ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailOrderProducts serviceOrderDetailOrderProducts = ServiceOrderDetailOrderProducts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -296,18 +272,15 @@ ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(
   if (productName != null) {
     serviceOrderDetailOrderProducts.productName = productName;
   }
-  final String? productAmount = jsonConvert.convert<String>(
-      json['product_amount']);
+  final String? productAmount = jsonConvert.convert<String>(json['product_amount']);
   if (productAmount != null) {
     serviceOrderDetailOrderProducts.productAmount = productAmount;
   }
-  final String? urgentAmount = jsonConvert.convert<String>(
-      json['urgent_amount']);
+  final String? urgentAmount = jsonConvert.convert<String>(json['urgent_amount']);
   if (urgentAmount != null) {
     serviceOrderDetailOrderProducts.urgentAmount = urgentAmount;
   }
-  final String? holidayAmount = jsonConvert.convert<String>(
-      json['holiday_amount']);
+  final String? holidayAmount = jsonConvert.convert<String>(json['holiday_amount']);
   if (holidayAmount != null) {
     serviceOrderDetailOrderProducts.holidayAmount = holidayAmount;
   }
@@ -323,16 +296,14 @@ ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(
   if (totalAmount != null) {
     serviceOrderDetailOrderProducts.totalAmount = totalAmount;
   }
-  final String? plannedServiceAt = jsonConvert.convert<String>(
-      json['planned_service_at']);
+  final String? plannedServiceAt = jsonConvert.convert<String>(json['planned_service_at']);
   if (plannedServiceAt != null) {
     serviceOrderDetailOrderProducts.plannedServiceAt = plannedServiceAt;
   }
   return serviceOrderDetailOrderProducts;
 }
 
-Map<String, dynamic> $ServiceOrderDetailOrderProductsToJson(
-    ServiceOrderDetailOrderProducts entity) {
+Map<String, dynamic> $ServiceOrderDetailOrderProductsToJson(ServiceOrderDetailOrderProducts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['product_name'] = entity.productName;
@@ -371,8 +342,7 @@ extension ServiceOrderDetailOrderProductsExtension on ServiceOrderDetailOrderPro
   }
 }
 
-ServiceOrderDetailEstate $ServiceOrderDetailEstateFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailEstate $ServiceOrderDetailEstateFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailEstate serviceOrderDetailEstate = ServiceOrderDetailEstate();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -385,8 +355,7 @@ ServiceOrderDetailEstate $ServiceOrderDetailEstateFromJson(
   return serviceOrderDetailEstate;
 }
 
-Map<String, dynamic> $ServiceOrderDetailEstateToJson(
-    ServiceOrderDetailEstate entity) {
+Map<String, dynamic> $ServiceOrderDetailEstateToJson(ServiceOrderDetailEstate entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -404,8 +373,7 @@ extension ServiceOrderDetailEstateExtension on ServiceOrderDetailEstate {
   }
 }
 
-ServiceOrderDetailEstateUnit $ServiceOrderDetailEstateUnitFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailEstateUnit $ServiceOrderDetailEstateUnitFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailEstateUnit serviceOrderDetailEstateUnit = ServiceOrderDetailEstateUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -422,8 +390,7 @@ ServiceOrderDetailEstateUnit $ServiceOrderDetailEstateUnitFromJson(
   return serviceOrderDetailEstateUnit;
 }
 
-Map<String, dynamic> $ServiceOrderDetailEstateUnitToJson(
-    ServiceOrderDetailEstateUnit entity) {
+Map<String, dynamic> $ServiceOrderDetailEstateUnitToJson(ServiceOrderDetailEstateUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['unit'] = entity.unit;

packages/cs_domain/lib/generated/json/service_repair_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_repair_detail_entity.dart';
 
-ServiceRepairDetailEntity $ServiceRepairDetailEntityFromJson(
-    Map<String, dynamic> json) {
+ServiceRepairDetailEntity $ServiceRepairDetailEntityFromJson(Map<String, dynamic> json) {
   final ServiceRepairDetailEntity serviceRepairDetailEntity = ServiceRepairDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -16,21 +15,18 @@ ServiceRepairDetailEntity $ServiceRepairDetailEntityFromJson(
   if (description != null) {
     serviceRepairDetailEntity.description = description;
   }
-  final ServiceRepairDetailMerchant? merchant = jsonConvert.convert<
-      ServiceRepairDetailMerchant>(json['merchant']);
+  final ServiceRepairDetailMerchant? merchant = jsonConvert.convert<ServiceRepairDetailMerchant>(json['merchant']);
   if (merchant != null) {
     serviceRepairDetailEntity.merchant = merchant;
   }
-  final ServiceRepairDetailCategory? category = jsonConvert.convert<
-      ServiceRepairDetailCategory>(json['category']);
+  final ServiceRepairDetailCategory? category = jsonConvert.convert<ServiceRepairDetailCategory>(json['category']);
   if (category != null) {
     serviceRepairDetailEntity.category = category;
   }
   return serviceRepairDetailEntity;
 }
 
-Map<String, dynamic> $ServiceRepairDetailEntityToJson(
-    ServiceRepairDetailEntity entity) {
+Map<String, dynamic> $ServiceRepairDetailEntityToJson(ServiceRepairDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -57,8 +53,7 @@ extension ServiceRepairDetailEntityExtension on ServiceRepairDetailEntity {
   }
 }
 
-ServiceRepairDetailMerchant $ServiceRepairDetailMerchantFromJson(
-    Map<String, dynamic> json) {
+ServiceRepairDetailMerchant $ServiceRepairDetailMerchantFromJson(Map<String, dynamic> json) {
   final ServiceRepairDetailMerchant serviceRepairDetailMerchant = ServiceRepairDetailMerchant();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -71,8 +66,7 @@ ServiceRepairDetailMerchant $ServiceRepairDetailMerchantFromJson(
   return serviceRepairDetailMerchant;
 }
 
-Map<String, dynamic> $ServiceRepairDetailMerchantToJson(
-    ServiceRepairDetailMerchant entity) {
+Map<String, dynamic> $ServiceRepairDetailMerchantToJson(ServiceRepairDetailMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -90,8 +84,7 @@ extension ServiceRepairDetailMerchantExtension on ServiceRepairDetailMerchant {
   }
 }
 
-ServiceRepairDetailCategory $ServiceRepairDetailCategoryFromJson(
-    Map<String, dynamic> json) {
+ServiceRepairDetailCategory $ServiceRepairDetailCategoryFromJson(Map<String, dynamic> json) {
   final ServiceRepairDetailCategory serviceRepairDetailCategory = ServiceRepairDetailCategory();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -108,8 +101,7 @@ ServiceRepairDetailCategory $ServiceRepairDetailCategoryFromJson(
   return serviceRepairDetailCategory;
 }
 
-Map<String, dynamic> $ServiceRepairDetailCategoryToJson(
-    ServiceRepairDetailCategory entity) {
+Map<String, dynamic> $ServiceRepairDetailCategoryToJson(ServiceRepairDetailCategory entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/service_time_period_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_time_period_entity.dart';
 
-ServiceTimePeriodEntity $ServiceTimePeriodEntityFromJson(
-    Map<String, dynamic> json) {
+ServiceTimePeriodEntity $ServiceTimePeriodEntityFromJson(Map<String, dynamic> json) {
   final ServiceTimePeriodEntity serviceTimePeriodEntity = ServiceTimePeriodEntity();
   final String? timeText = jsonConvert.convert<String>(json['time_text']);
   if (timeText != null) {
@@ -31,8 +30,7 @@ ServiceTimePeriodEntity $ServiceTimePeriodEntityFromJson(
   return serviceTimePeriodEntity;
 }
 
-Map<String, dynamic> $ServiceTimePeriodEntityToJson(
-    ServiceTimePeriodEntity entity) {
+Map<String, dynamic> $ServiceTimePeriodEntityToJson(ServiceTimePeriodEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['time_text'] = entity.timeText;
   data['time'] = entity.time;

packages/cs_domain/lib/generated/json/user_me_entity.g.dart

@@ -23,13 +23,11 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (email != null) {
     userMeEntity.email = email;
   }
-  final String? followsCount = jsonConvert.convert<String>(
-      json['follows_count']);
+  final String? followsCount = jsonConvert.convert<String>(json['follows_count']);
   if (followsCount != null) {
     userMeEntity.followsCount = followsCount;
   }
-  final String? flowersCount = jsonConvert.convert<String>(
-      json['flowers_count']);
+  final String? flowersCount = jsonConvert.convert<String>(json['flowers_count']);
   if (flowersCount != null) {
     userMeEntity.flowersCount = flowersCount;
   }
@@ -37,28 +35,21 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (postsCount != null) {
     userMeEntity.postsCount = postsCount;
   }
-  final List<UserMeHouseholds>? households = (json['households'] as List<
-      dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds)
-      .toList();
+  final List<UserMeHouseholds>? households = (json['households'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds).toList();
   if (households != null) {
     userMeEntity.households = households;
   }
-  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates)
-      .toList();
+  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates).toList();
   if (estates != null) {
     userMeEntity.estates = estates;
   }
-  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(
-      json['default_unit']);
+  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(json['default_unit']);
   if (defaultUnit != null) {
     userMeEntity.defaultUnit = defaultUnit;
   }
-  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(
-      json['information']);
+  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(json['information']);
   if (information != null) {
     userMeEntity.information = information;
   }
@@ -161,12 +152,8 @@ UserMeEstates $UserMeEstatesFromJson(Map<String, dynamic> json) {
   if (name != null) {
     userMeEstates.name = name;
   }
-  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts)
-      .toList();
+  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts).toList();
   if (accounts != null) {
     userMeEstates.accounts = accounts;
   }
@@ -194,8 +181,7 @@ extension UserMeEstatesExtension on UserMeEstates {
   }
 }
 
-UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccounts userMeEstatesAccounts = UserMeEstatesAccounts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -221,16 +207,14 @@ UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
   if (status != null) {
     userMeEstatesAccounts.status = status;
   }
-  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<
-      UserMeEstatesAccountsUnit>(json['unit']);
+  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<UserMeEstatesAccountsUnit>(json['unit']);
   if (unit != null) {
     userMeEstatesAccounts.unit = unit;
   }
   return userMeEstatesAccounts;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsToJson(
-    UserMeEstatesAccounts entity) {
+Map<String, dynamic> $UserMeEstatesAccountsToJson(UserMeEstatesAccounts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -263,8 +247,7 @@ extension UserMeEstatesAccountsExtension on UserMeEstatesAccounts {
   }
 }
 
-UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccountsUnit userMeEstatesAccountsUnit = UserMeEstatesAccountsUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -289,8 +272,7 @@ UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
   return userMeEstatesAccountsUnit;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(
-    UserMeEstatesAccountsUnit entity) {
+Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(UserMeEstatesAccountsUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['block'] = entity.block;

packages/cs_domain/lib/generated/json/visitor_page_entity.g.dart

@@ -19,10 +19,8 @@ VisitorPageEntity $VisitorPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     visitorPageEntity.countPage = countPage;
   }
-  final List<VisitorPageList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<VisitorPageList>(e) as VisitorPageList)
-      .toList();
+  final List<VisitorPageList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<VisitorPageList>(e) as VisitorPageList).toList();
   if (list != null) {
     visitorPageEntity.list = list;
   }
@@ -74,8 +72,7 @@ VisitorPageList $VisitorPageListFromJson(Map<String, dynamic> json) {
   if (nric != null) {
     visitorPageList.nric = nric;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(
-      json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
   if (vehicleNumber != null) {
     visitorPageList.vehicleNumber = vehicleNumber;
   }

packages/cs_domain/lib/repository/auth_repository.dart

@@ -214,4 +214,44 @@ class AuthRepository {
     return result.convert();
   }
 
+  /// 注册 FCM Token
+  Future<HttpResult> registerFCMToken({
+    required String? fcmToken,
+    CancelToken? cancelToken,
+  }) async {
+    Map<String, String> params = {};
+    params['fcm_token'] = fcmToken!;
+
+    final result = await dioEngine.requestNetResult(
+      ApiConstants.apiFCMToken,
+      params: params,
+      method: HttpMethod.POST,
+      networkDebounce: true,
+      cancelToken: cancelToken,
+    );
+
+    if (result.isSuccess) {
+      return result.convert();
+    }
+    return result.convert();
+  }
+
+  /// 用户登出
+  Future<HttpResult> authLogout({
+    CancelToken? cancelToken,
+  }) async {
+
+    final result = await dioEngine.requestNetResult(
+      ApiConstants.apiUserLogout,
+      method: HttpMethod.POST,
+      isShowLoadingDialog: true,
+      networkDebounce: true,
+      cancelToken: cancelToken,
+    );
+
+    if (result.isSuccess) {
+      return result.convert();
+    }
+    return result.convert();
+  }
 }

packages/cs_plugin_basic/lib/fcm/fcm_utils.dart

@@ -0,0 +1,139 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:router/componentRouter/component_service_manager.dart';
+import 'package:shared/utils/log_utils.dart';
+
+// 定义一个回调函数类型
+typedef TokenCallback = void Function(String token);
+
+class FcmUtils {
+  //FCM SDK对象
+  final _firebaseMessaging = FirebaseMessaging.instance;
+
+  //Notifications插件对象
+  final _localNotifications = FlutterLocalNotificationsPlugin();
+
+  //Android 8+ 的消息通道
+  final _androidChannel = const AndroidNotificationChannel(
+      'Normal', //设置 Channel ID
+      'Channel Normal Android', //设置 Channel 名称
+      importance: Importance.defaultImportance); //设置该 Channel 的优先级
+
+  // 初始化，获取设备token
+  Future<void> initNotifications({
+    TokenCallback? onToken, // Token回调函数
+  }) async {
+    //申请动态通知权限
+    await _firebaseMessaging.requestPermission();
+    //获取 FCM Token
+    final fCMToken = await _firebaseMessaging.getToken();
+    if (fCMToken != null) {
+      Log.d("FCM -> Token:$fCMToken");
+      onToken?.call(fCMToken); // 将初始 Token 通过回调传递
+    }
+    //刷新 FCM Token 的监听
+    _firebaseMessaging.onTokenRefresh.listen((newToken) {
+      Log.d("FCM onTokenRefresh -> Token:$newToken");
+      onToken?.call(newToken); // 将刷新后的 Token 通过回调传递
+    });
+
+    Log.d("FCM -> Token:$fCMToken"); // 这个就是设备token，后端通过这token给设备发送信息
+
+    //拿到 FCM Token 之后初始化一些监听
+    _initPushNotifications();
+    _initLocalNotifications();
+  }
+
+  /// Notifications 插件初始化，监听前台消息
+  Future _initLocalNotifications() async {
+    const iOS = DarwinInitializationSettings();
+    // @drawable/ic_launcher是应用的图标，路径是：android/app/src/main/res/mipmap/ic_launcher.png
+    const android = AndroidInitializationSettings('@mipmap/ic_launcher');
+    // Notifications 插件只需要处理 Android 和 iOS 平台的配置
+    const settings = InitializationSettings(android: android, iOS: iOS);
+    // Notifications 插件初始化
+    await _localNotifications.initialize(settings, onDidReceiveNotificationResponse: (NotificationResponse response) {
+      // android 前台消息点击回调
+      final message = RemoteMessage.fromMap(jsonDecode(response.payload!));
+      Log.d(response);
+      // 处理收到消息
+      handleMessage(message);
+    });
+    //Android 8 以上会通过 Channel 创建对应的通知渠道
+    final platform = _localNotifications.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
+    await platform?.createNotificationChannel(_androidChannel);
+  }
+
+  /// FCM 初始化接收消息的各种回调
+  Future _initPushNotifications() async {
+    await _firebaseMessaging.setForegroundNotificationPresentationOptions(alert: true, badge: true, sound: true);
+
+    // 打开app时，会执行该回调，获取消息（通常是程序终止时，点击消息打开app的回调）
+    _firebaseMessaging.getInitialMessage().then(
+      (RemoteMessage? message) {
+        if (message == null) return; // 没有消息不执行后操作
+        handleMessage(message);
+      },
+    );
+
+    // 后台程序运行时，点击消息触发
+    FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) => handleMessage(message));
+
+    // 前台消息，android不会弹出通知框，所以需要 Notifications 插件自定义本地通知（iOS没有前台消息，iOS的前台消息和后台运行时一样的效果）
+    FirebaseMessaging.onMessage.listen((message) {
+      Log.d("前台收到的消息 -> message:${message.data}");
+      final notification = message.notification;
+      if (notification == null) return;
+      if (Platform.isIOS) return;
+
+      _localNotifications.show(
+          notification.hashCode,
+          notification.title,
+          notification.body,
+          NotificationDetails(
+              android: AndroidNotificationDetails(
+            _androidChannel.id,
+            _androidChannel.name,
+            icon: '@mipmap/ic_launcher',
+          )),
+          payload: jsonEncode(message.toMap()));
+    });
+
+    // 后台处理，后台程序运行时收到消息，不打开app也会执行的回调
+    // FirebaseMessaging.onBackgroundMessage(FirebaseApi.handleBackgroundMessage);
+  }
+
+  // 处理收到的消息，比如跳转页面或者其他处理
+  void handleMessage(RemoteMessage message) {
+    final dataJson = message.data;
+
+    // 1、加入unit成功  ApprovedJoinUnitNotification
+    // 2、加入unit失败  RejectedJoinUnitNotification
+    // 3、online form批准了  ApprovedApplyOnlineFormNotification
+    // 4、online form拒绝了  RejectedApplyOnlineFormNotification
+    // 5、facility 预定成功了(不需要，因为支付了就是预定成功了)
+    // 6、facility 预定失败了(长时间未支付，被系统取消了)  FacilityBookingNotPaidCancelNotification
+    // 7、每月物业费账单生成了
+    // 8、每月停车费账单生成了
+    // 9、服务订单长时间未支付  PaidServiceOrderNotPaidCancelNotification
+
+    String? type = dataJson['type'];
+    if (type == 'ApprovedApplyOnlineFormNotification' || type == 'RejectedApplyOnlineFormNotification') {
+      //去 Form 详情
+      ComponentServiceManager().formService.startFormDetailPage(dataJson['estate_online_form_id'], dataJson['id'], dataJson['online_form_type_id']);
+    }
+
+    Log.d("点击消息的处理 handleMessage -> data:$dataJson");
+  }
+
+// static Future<void> handleBackgroundMessage(RemoteMessage message) async {
+//   print('后台消息');
+//   // BotToast.showText(text: '后台消息:${message.toString()}');
+//   print('title:${message.notification?.title}');
+//   print('body:${message.notification?.body}');
+//   print('payload:${message.data}');
+//   print('message:${message}');
+// }
+}

packages/cs_plugin_basic/pubspec.yaml

@@ -51,7 +51,7 @@ dependencies:
   package_info_plus: 8.0.2
 
   # 获取当前设备信息 https://github.com/fluttercommunity/plus_plugins/tree/main/packages/device_info_plus
-  device_info_plus: 10.0.1
+  device_info_plus: ^11.3.0
 
   # 跳转应用处理 https://github.com/flutter/plugins/tree/master_archive/packages/url_launcher/url_launcher
   # 例如：拨打电话，发送短信，发送邮件，跳转Whatsapp，打开本地文件等操作
@@ -64,7 +64,7 @@ dependencies:
   visibility_detector: ^0.4.0+2
 
   # FCM推送
-  firebase_messaging: ^14.7.2
+  firebase_messaging: ^15.2.6
 
   # App本地通知
   flutter_local_notifications: ^19.2.1

packages/cs_plugin_platform/lib/engine/permission/permission_engine.dart

@@ -87,7 +87,7 @@ class PermissionEngine {
           Log.d("判断响应结果:1");
           // 如果是延迟Future完成了，表示500毫秒内没有获得权限响应，显示对话框
           _showPermissionDialog(
-              "“YYHome” would like to access your multimedia album for functions such as image uploading and saving. Please allow me to obtain your permission");
+              "“24IFM” would like to access your multimedia album for functions such as image uploading and saving. Please allow me to obtain your permission");
           // 再次等待权限请求结果
           ps = await permissionRequestFuture;
           DialogEngine.dismiss(tag: "permission");
@@ -147,7 +147,7 @@ class PermissionEngine {
       if (firstCompleted == 'delay') {
         // 如果是延迟Future完成了，表示500毫秒内没有获得权限响应，显示对话框
         _showPermissionDialog(
-            "“YYHome” requests to use your camera permission for functions such as taking avatars, uploading and saving images. Please allow me to obtain your permission");
+            "“24IFM” requests to use your camera permission for functions such as taking avatars, uploading and saving images. Please allow me to obtain your permission");
         // 再次等待权限请求结果
         status = await permissionRequestFuture;
         DialogEngine.dismiss(tag: "permission");