packages/cpt_services/lib/modules/services/clean_order_cancel_success/clean_order_cancel_success_page.dart

@@ -33,9 +33,9 @@ class CleanOrderCancelSuccessPage extends HookConsumerWidget {
   //启动当前页面
   static void startInstance({BuildContext? context}) {
     if (context != null) {
-      context.router.push(const CleanOrderCancelSuccessPageRoute());
+      context.router.replace(const CleanOrderCancelSuccessPageRoute());
     } else {
-      appRouter.push(const CleanOrderCancelSuccessPageRoute());
+      appRouter.replace(const CleanOrderCancelSuccessPageRoute());
     }
   }
 

packages/cpt_services/lib/modules/services/clean_order_detail/clean_order_detail_page.dart

@@ -360,8 +360,8 @@ class CleanOrderDetailPage extends HookConsumerWidget {
     // final isDisable = useState<bool>(disabled);
 
     return Container(
-      padding: EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
-      margin: EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0),
+      padding: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
+      margin: const EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0),
       color: ColorUtils.string2Color('#F8F8F8'),
       child: Column(
         children: [

packages/cpt_services/lib/modules/services/clean_order_detail/clean_order_detail_vm.dart

@@ -9,11 +9,15 @@ import 'package:domain/entity/garage_sale_rent_entity.dart';
 import 'package:domain/entity/newsfeed_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:plugin_basic/basic_export.dart';
+import 'package:plugin_basic/constants/app_constant.dart';
 import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
+import 'package:plugin_platform/engine/permission/permission_engine.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/ext/auto_router_extensions.dart';
+import 'package:shared/utils/event_bus.dart';
 import 'package:shared/utils/ext_dart.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:shared/utils/util.dart';
@@ -98,6 +102,17 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
     fetchOrderDetailData(id);
   }
 
+  void _callPhone(String? phone) {
+    PermissionEngine().requestCallPhonePermission(() async {
+      final Uri launchUri = Uri(scheme: 'tel', path: phone);
+      if (await canLaunchUrl(launchUri)) {
+        await launchUrl(launchUri);
+      } else {
+        ToastEngine.show("Can not Call Phone");
+      }
+    });
+  }
+
   handlerClickActionBtn(BuildContext context, Map<String, dynamic> actionBtn) {
     final actionBtnCode = actionBtn['code']!.toString();
     switch (actionBtnCode) {
@@ -107,11 +122,15 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
         break;
       case '1':
         // Contact Merchant
-
+        _callPhone(state.datas?.merchant?.contactPhone);
         break;
       case '2':
         // Contact Service Personnel
-
+        if (Utils.isNotEmpty(state.datas?.staff?.phone)) {
+          _callPhone(state.datas?.staff?.phone);
+        } else {
+          ToastEngine.show("Currently, no staffs have been assigned");
+        }
         break;
       case '3':
         // Delete
@@ -209,6 +228,7 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
       final result = await servicesRespositoryInstance.fetchCancelPaidServiceOrder(id: _detailId.toString(), reason: state.cancelReason);
 
       if (result.isSuccess) {
+        bus.emit(AppConstant.eventServiceOrderRefresh, _detailId.toString());
         clearReasonInput();
         //去成功页面
         CleanOrderCancelSuccessPage.startInstance();

packages/cpt_services/lib/modules/services/history/history_vm.dart

@@ -1,13 +1,14 @@
-
 import 'package:cs_resources/generated/assets.dart';
 import 'package:domain/entity/garage_sale_history_entity.dart';
 import 'package:domain/entity/garage_sale_rent_entity.dart';
 import 'package:domain/entity/newsfeed_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:plugin_basic/constants/app_constant.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/ext/auto_router_extensions.dart';
+import 'package:shared/utils/event_bus.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/widget_export.dart';
@@ -20,7 +21,7 @@ import 'history_state.dart';
 part 'history_vm.g.dart';
 
 @riverpod
-class HistoryVm extends _$HistoryVm with DioCancelableMixin{
+class HistoryVm extends _$HistoryVm with DioCancelableMixin {
   late ServicesRespository servicesRespositoryInstance;
   bool _needShowPlaceholder = false; //是否展示LoadingView
   int _page = 1; // 当前页
@@ -40,9 +41,7 @@ class HistoryVm extends _$HistoryVm with DioCancelableMixin{
   );
 
   HistoryState initState() {
-    return HistoryState(
-        list: []
-    );
+    return HistoryState(list: []);
   }
 
   @override
@@ -51,8 +50,11 @@ class HistoryVm extends _$HistoryVm with DioCancelableMixin{
     // 引入数据仓库
     // servicesRespositoryInstance = ref.read(commonGarageRespositoryProvider);
     final state = initState();
+    registerEventBus();
     Log.d("--------------------------build---------------------");
-    registerCancellation();
+    registerCancellation(callback: () {
+      unregisterEventBus();
+    });
 
     return state;
   }
@@ -175,8 +177,27 @@ class HistoryVm extends _$HistoryVm with DioCancelableMixin{
     return _queryParams;
   }
 
+  // EventBus 的事件接收
+  Subscription? subscribe;
+
+  void registerEventBus() {
+    subscribe = bus.on(AppConstant.eventServiceOrderRefresh, (arg) {
+      if (arg is String) {
+        final String id = arg;
+        Log.d("需要删除的订单id:$id");
+        //从页面列表中找到对应的id并删除对应的Item
+        final updatedList = state.list.where((element) => element.id != id).toList();
+        state = state.copyWith(list: updatedList);
+      }
+    });
+  }
+
+  void unregisterEventBus() {
+    bus.off(AppConstant.eventServiceOrderRefresh, subscribe);
+  }
+
   //  去详情页面
   gotoCleanOrderDetailPage(BuildContext context, int id, String cleanServiceType, int serviesStatusCode) {
     CleanOrderDetailPage.startInstance(id: id, cleanServiceType: cleanServiceType, serviesStatusCode: serviesStatusCode);
   }
-}
+}

packages/cpt_services/lib/modules/services/inProgress/in_progress_vm.dart

@@ -3,6 +3,7 @@ import 'package:domain/entity/garage_sale_history_entity.dart';
 import 'package:domain/entity/garage_sale_rent_entity.dart';
 import 'package:domain/entity/newsfeed_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:plugin_basic/constants/app_constant.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';
@@ -15,6 +16,7 @@ import '../../../respository/services_respository.dart';
 import '../../../router/page/services_page_router.dart';
 import '../clean_order_detail/clean_order_detail_page.dart';
 import 'in_progress_state.dart';
+import 'package:shared/utils/event_bus.dart';
 
 part 'in_progress_vm.g.dart';
 
@@ -39,9 +41,7 @@ class InProgressVm extends _$InProgressVm with DioCancelableMixin {
   );
 
   InProgressState initState() {
-    return InProgressState(
-        list: []
-    );
+    return InProgressState(list: []);
   }
 
   @override
@@ -50,8 +50,11 @@ class InProgressVm extends _$InProgressVm with DioCancelableMixin {
     // 引入数据仓库
     // servicesRespositoryInstance = ref.read(commonGarageRespositoryProvider);
     final state = initState();
+    registerEventBus();
     Log.d("--------------------------build---------------------");
-    registerCancellation();
+    registerCancellation(callback: () {
+      unregisterEventBus();
+    });
     return state;
   }
 
@@ -173,6 +176,25 @@ class InProgressVm extends _$InProgressVm with DioCancelableMixin {
     return _queryParams;
   }
 
+  // EventBus 的事件接收
+  Subscription? subscribe;
+
+  void registerEventBus() {
+    subscribe = bus.on(AppConstant.eventServiceOrderRefresh, (arg) {
+      if (arg is String) {
+        final String id = arg;
+        Log.d("需要删除的订单id:$id");
+        //从页面列表中找到对应的id并删除对应的Item
+        final updatedList = state.list.where((element) => element.id != id).toList();
+        state = state.copyWith(list: updatedList);
+      }
+    });
+  }
+
+  void unregisterEventBus() {
+    bus.off(AppConstant.eventServiceOrderRefresh, subscribe);
+  }
+
   //  去详情页面
   gotoCleanOrderDetailPage(BuildContext context, int id, String cleanServiceType, int serviesStatusCode) {
     CleanOrderDetailPage.startInstance(id: id, cleanServiceType: cleanServiceType, serviesStatusCode: serviesStatusCode);

packages/cs_domain/lib/entity/service_order_detail_entity.dart

@@ -1,4 +1,3 @@
-import 'package:domain/entity/id_name_entity.dart';
 import 'package:domain/generated/json/base/json_field.dart';
 import 'package:domain/generated/json/service_order_detail_entity.g.dart';
 import 'dart:convert';
@@ -16,7 +15,8 @@ class ServiceOrderDetailEntity {
 	ServiceOrderDetailAccount? account;
 	@JSONField(name: "order_service")
 	ServiceOrderDetailOrderService? orderService;
-	IdNameEntity? merchant;
+	ServiceOrderDetailMerchant? merchant;
+	ServiceOrderDetailStaff? staff;
 	@JSONField(name: "order_products")
 	List<ServiceOrderDetailOrderProducts>? orderProducts = [];
 	ServiceOrderDetailEstate? estate;
@@ -37,7 +37,7 @@ class ServiceOrderDetailEntity {
 
 @JsonSerializable()
 class ServiceOrderDetailAccount {
-	String? id;
+	int? id;
 	String? name;
 	String? avatar;
 	String? phone;
@@ -56,7 +56,7 @@ class ServiceOrderDetailAccount {
 
 @JsonSerializable()
 class ServiceOrderDetailOrderService {
-	String? id;
+	int? id;
 	String? name;
 	@JSONField(name: "evaluations_avg_score")
 	double evaluationsAvgScore = 0.0;
@@ -73,6 +73,42 @@ class ServiceOrderDetailOrderService {
 	}
 }
 
+@JsonSerializable()
+class ServiceOrderDetailMerchant {
+	String? id;
+	String? name;
+	@JSONField(name: "contact_phone")
+	String? contactPhone;
+
+	ServiceOrderDetailMerchant();
+
+	factory ServiceOrderDetailMerchant.fromJson(Map<String, dynamic> json) => $ServiceOrderDetailMerchantFromJson(json);
+
+	Map<String, dynamic> toJson() => $ServiceOrderDetailMerchantToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class ServiceOrderDetailStaff {
+	String? id;
+	String? name;
+	String? phone;
+
+	ServiceOrderDetailStaff();
+
+	factory ServiceOrderDetailStaff.fromJson(Map<String, dynamic> json) => $ServiceOrderDetailStaffFromJson(json);
+
+	Map<String, dynamic> toJson() => $ServiceOrderDetailStaffToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
 
 @JsonSerializable()
 class ServiceOrderDetailOrderProducts {

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

@@ -19,15 +19,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;
   }
@@ -66,23 +63,19 @@ 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 FacilityPageListAccount? account = jsonConvert.convert<
-      FacilityPageListAccount>(json['account']);
+  final FacilityPageListAccount? account = jsonConvert.convert<FacilityPageListAccount>(json['account']);
   if (account != null) {
     facilityDetail.account = account;
   }
@@ -113,8 +106,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) {
@@ -136,21 +128,18 @@ FacilityPageListBooking $FacilityPageListBookingFromJson(
   if (depositPaid != null) {
     facilityPageListBooking.depositPaid = depositPaid;
   }
-  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;
@@ -183,8 +172,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) {
@@ -194,16 +182,14 @@ FacilityPageListFacility $FacilityPageListFacilityFromJson(
   if (name != null) {
     facilityPageListFacility.name = name;
   }
-  final FacilityPageListFacilityType? type = jsonConvert.convert<
-      FacilityPageListFacilityType>(json['type']);
+  final FacilityPageListFacilityType? type = jsonConvert.convert<FacilityPageListFacilityType>(json['type']);
   if (type != null) {
     facilityPageListFacility.type = type;
   }
   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;
@@ -224,8 +210,7 @@ extension FacilityPageListFacilityExtension on FacilityPageListFacility {
   }
 }
 
-FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(Map<String, dynamic> json) {
   final FacilityPageListFacilityType facilityPageListFacilityType = FacilityPageListFacilityType();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -238,8 +223,7 @@ FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(
   return facilityPageListFacilityType;
 }
 
-Map<String, dynamic> $FacilityPageListFacilityTypeToJson(
-    FacilityPageListFacilityType entity) {
+Map<String, dynamic> $FacilityPageListFacilityTypeToJson(FacilityPageListFacilityType entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -257,8 +241,7 @@ extension FacilityPageListFacilityTypeExtension on FacilityPageListFacilityType
   }
 }
 
-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) {
@@ -271,8 +254,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;
@@ -290,8 +272,7 @@ extension FacilityPageListTimePeriodExtension on FacilityPageListTimePeriod {
   }
 }
 
-FacilityPageListAccount $FacilityPageListAccountFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListAccount $FacilityPageListAccountFromJson(Map<String, dynamic> json) {
   final FacilityPageListAccount facilityPageListAccount = FacilityPageListAccount();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -304,8 +285,7 @@ FacilityPageListAccount $FacilityPageListAccountFromJson(
   return facilityPageListAccount;
 }
 
-Map<String, dynamic> $FacilityPageListAccountToJson(
-    FacilityPageListAccount entity) {
+Map<String, dynamic> $FacilityPageListAccountToJson(FacilityPageListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

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;
   }

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_submitted_entity.g.dart

@@ -15,13 +15,11 @@ 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;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
-      json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
   if (content != null) {
     formSubmittedEntity.content = content;
   }
@@ -37,13 +35,11 @@ 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;
   }
@@ -89,8 +85,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) {
@@ -111,8 +106,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;

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) {
@@ -163,8 +146,7 @@ PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(
   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;
@@ -182,8 +164,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) {
@@ -200,8 +181,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;
@@ -222,8 +202,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) {
@@ -233,8 +212,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;
   }
@@ -245,8 +223,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;
@@ -270,8 +247,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) {
@@ -290,8 +266,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;
   }
@@ -302,8 +277,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;
@@ -333,8 +307,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) {
@@ -351,8 +324,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,46 +23,38 @@ 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;
   }
   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;
@@ -111,8 +102,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) {
@@ -133,8 +123,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;
@@ -158,8 +147,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) {
@@ -169,17 +157,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;
@@ -200,8 +185,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) {
@@ -211,16 +195,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;
@@ -241,8 +223,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) {
@@ -259,8 +240,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;
@@ -281,8 +261,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) {
@@ -300,16 +279,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;
@@ -336,8 +313,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) {
@@ -350,8 +326,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;
@@ -369,8 +344,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) {
@@ -387,8 +361,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;

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

@@ -19,10 +19,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;
   }
@@ -74,13 +72,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;
   }
@@ -117,8 +113,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) {
@@ -131,8 +126,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;
@@ -150,8 +144,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) {
@@ -168,8 +161,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_order_detail_entity.g.dart

@@ -1,10 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_order_detail_entity.dart';
-import 'package:domain/entity/id_name_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) {
@@ -26,45 +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 IdNameEntity? merchant = jsonConvert.convert<IdNameEntity>(
-      json['merchant']);
+  final ServiceOrderDetailMerchant? merchant = jsonConvert.convert<ServiceOrderDetailMerchant>(json['merchant']);
   if (merchant != null) {
     serviceOrderDetailEntity.merchant = merchant;
   }
-  final List<
-      ServiceOrderDetailOrderProducts>? orderProducts = (json['order_products'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<ServiceOrderDetailOrderProducts>(
-          e) as ServiceOrderDetailOrderProducts).toList();
+  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();
   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;
@@ -74,8 +65,8 @@ Map<String, dynamic> $ServiceOrderDetailEntityToJson(
   data['account'] = entity.account?.toJson();
   data['order_service'] = entity.orderService?.toJson();
   data['merchant'] = entity.merchant?.toJson();
-  data['order_products'] =
-      entity.orderProducts?.map((v) => v.toJson()).toList();
+  data['staff'] = entity.staff?.toJson();
+  data['order_products'] = entity.orderProducts?.map((v) => v.toJson()).toList();
   data['estate'] = entity.estate?.toJson();
   data['estate_unit'] = entity.estateUnit?.toJson();
   return data;
@@ -90,7 +81,8 @@ extension ServiceOrderDetailEntityExtension on ServiceOrderDetailEntity {
     String? notes,
     ServiceOrderDetailAccount? account,
     ServiceOrderDetailOrderService? orderService,
-    IdNameEntity? merchant,
+    ServiceOrderDetailMerchant? merchant,
+    ServiceOrderDetailStaff? staff,
     List<ServiceOrderDetailOrderProducts>? orderProducts,
     ServiceOrderDetailEstate? estate,
     ServiceOrderDetailEstateUnit? estateUnit,
@@ -104,16 +96,16 @@ extension ServiceOrderDetailEntityExtension on ServiceOrderDetailEntity {
       ..account = account ?? this.account
       ..orderService = orderService ?? this.orderService
       ..merchant = merchant ?? this.merchant
+      ..staff = staff ?? this.staff
       ..orderProducts = orderProducts ?? this.orderProducts
       ..estate = estate ?? this.estate
       ..estateUnit = estateUnit ?? this.estateUnit;
   }
 }
 
-ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailAccount serviceOrderDetailAccount = ServiceOrderDetailAccount();
-  final String? id = jsonConvert.convert<String>(json['id']);
+  final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
     serviceOrderDetailAccount.id = id;
   }
@@ -132,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;
@@ -144,7 +135,7 @@ Map<String, dynamic> $ServiceOrderDetailAccountToJson(
 
 extension ServiceOrderDetailAccountExtension on ServiceOrderDetailAccount {
   ServiceOrderDetailAccount copyWith({
-    String? id,
+    int? id,
     String? name,
     String? avatar,
     String? phone,
@@ -157,10 +148,9 @@ extension ServiceOrderDetailAccountExtension on ServiceOrderDetailAccount {
   }
 }
 
-ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(
-    Map<String, dynamic> json) {
+ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailOrderService serviceOrderDetailOrderService = ServiceOrderDetailOrderService();
-  final String? id = jsonConvert.convert<String>(json['id']);
+  final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
     serviceOrderDetailOrderService.id = id;
   }
@@ -168,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;
@@ -187,7 +175,7 @@ Map<String, dynamic> $ServiceOrderDetailOrderServiceToJson(
 
 extension ServiceOrderDetailOrderServiceExtension on ServiceOrderDetailOrderService {
   ServiceOrderDetailOrderService copyWith({
-    String? id,
+    int? id,
     String? name,
     double? evaluationsAvgScore,
   }) {
@@ -198,8 +186,83 @@ extension ServiceOrderDetailOrderServiceExtension on ServiceOrderDetailOrderServ
   }
 }
 
-ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(
-    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) {
+    serviceOrderDetailMerchant.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    serviceOrderDetailMerchant.name = name;
+  }
+  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
+  if (contactPhone != null) {
+    serviceOrderDetailMerchant.contactPhone = contactPhone;
+  }
+  return serviceOrderDetailMerchant;
+}
+
+Map<String, dynamic> $ServiceOrderDetailMerchantToJson(ServiceOrderDetailMerchant entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['contact_phone'] = entity.contactPhone;
+  return data;
+}
+
+extension ServiceOrderDetailMerchantExtension on ServiceOrderDetailMerchant {
+  ServiceOrderDetailMerchant copyWith({
+    String? id,
+    String? name,
+    String? contactPhone,
+  }) {
+    return ServiceOrderDetailMerchant()
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..contactPhone = contactPhone ?? this.contactPhone;
+  }
+}
+
+ServiceOrderDetailStaff $ServiceOrderDetailStaffFromJson(Map<String, dynamic> json) {
+  final ServiceOrderDetailStaff serviceOrderDetailStaff = ServiceOrderDetailStaff();
+  final String? id = jsonConvert.convert<String>(json['id']);
+  if (id != null) {
+    serviceOrderDetailStaff.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    serviceOrderDetailStaff.name = name;
+  }
+  final String? phone = jsonConvert.convert<String>(json['phone']);
+  if (phone != null) {
+    serviceOrderDetailStaff.phone = phone;
+  }
+  return serviceOrderDetailStaff;
+}
+
+Map<String, dynamic> $ServiceOrderDetailStaffToJson(ServiceOrderDetailStaff entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['phone'] = entity.phone;
+  return data;
+}
+
+extension ServiceOrderDetailStaffExtension on ServiceOrderDetailStaff {
+  ServiceOrderDetailStaff copyWith({
+    String? id,
+    String? name,
+    String? phone,
+  }) {
+    return ServiceOrderDetailStaff()
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..phone = phone ?? this.phone;
+  }
+}
+
+ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(Map<String, dynamic> json) {
   final ServiceOrderDetailOrderProducts serviceOrderDetailOrderProducts = ServiceOrderDetailOrderProducts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -209,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;
   }
@@ -236,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;
@@ -284,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) {
@@ -298,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;
@@ -317,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) {
@@ -335,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_plugin_basic/lib/constants/app_constant.dart

@@ -24,6 +24,7 @@ class AppConstant {
   //消息通知Key
   static const eventProfileRefresh = 'event_profile_refresh'; //通知用户信息需要刷新
   static const eventEstateRefresh = 'event_estate_refresh'; //通知用户的房产信息需要刷新
+  static const eventServiceOrderRefresh = 'event_service_order_refresh'; //通知用户的服务订单
 
   //手机短信的国家区号
   static const countryCode = ApiConstants.isServerRelease ? "65" : "86"; //（测试环境为+86，正式环境为+65）

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

@@ -194,6 +194,53 @@ class PermissionEngine {
     }
   }
 
+  /// 申请拨打电话权限
+  void requestCallPhonePermission(void Function() success) async {
+    // 获取当前的权限
+    var status = await Permission.phone.status;
+    if (status.isGranted) {
+      // 已经授权
+      success();
+    } else {
+      // 未授权，则准备发起一次申请
+      var permissionRequestFuture = Permission.phone.request();
+
+      // 延迟500毫秒的Future
+      var delayFuture = Future.delayed(const Duration(milliseconds: 500), () => 'delay');
+
+      // 使用Future.any等待上述两个Future中的任何一个完成
+      var firstCompleted = await Future.any([permissionRequestFuture, delayFuture]);
+
+      // 判断响应结果
+      if (firstCompleted == 'delay') {
+        // 如果是延迟Future完成了，表示500毫秒内没有获得权限响应，显示对话框
+        _showPermissionDialog("“YYHome”requires permission to make phone calls for communication. Please allow access to this permission");
+        // 再次等待权限请求结果
+        status = await permissionRequestFuture;
+        DialogEngine.dismiss(tag: "permission");
+      } else {
+        // 权限请求已完成，立刻取消对话框展示（如果已经展示的话）
+        DialogEngine.dismiss(tag: "permission");
+        status = firstCompleted as PermissionStatus;
+      }
+
+      if (status.isGranted) {
+        // 用户授权
+        success();
+      } else {
+        // 权限被拒绝
+        await DialogEngine.show(
+          widget: AppDefaultDialog(
+              message: "Please go to your phone settings to enable phone calls permission",
+              title: "Alert",
+              confirmAction: () {
+                openAppSettings();
+              }),
+        );
+      }
+    }
+  }
+
   //顶部展示权限声明详情弹窗
   void _showPermissionDialog(String desc) {
     DialogEngine.show(