update

packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_vm.dart

@@ -5,6 +5,7 @@ import 'package:cs_resources/generated/assets.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:plugin_basic/basic_export.dart';
+import 'package:plugin_platform/engine/permission/permission_engine.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:router/ext/auto_router_extensions.dart';
@@ -236,16 +237,18 @@ class GaragesaleDetailVm extends _$GaragesaleDetailVm {
 
   // 拨打电话
   Future<void> makePhoneCall(String phoneNumber) async {
-    final Uri launchUri = Uri(
-      scheme: 'tel',
-      path: phoneNumber,
-    );
-
-    if (await canLaunchUrl(launchUri)) {
-      await launchUrl(launchUri);
-    } else {
-      ToastEngine.show("Could not launch $launchUri");
-      throw 'Could not launch $launchUri';
-    }
+    PermissionEngine().requestCallPhonePermission(() async {
+      final Uri launchUri = Uri(
+        scheme: 'tel',
+        path: phoneNumber,
+      );
+
+      if (await canLaunchUrl(launchUri)) {
+        await launchUrl(launchUri);
+      } else {
+        ToastEngine.show("Could not launch $launchUri");
+        throw 'Could not launch $launchUri';
+      }
+    });
   }
 }

packages/cpt_services/lib/components/chooseAirConditionContent_vm.dart

@@ -34,7 +34,7 @@ class ChooseAirConditionContentVm extends _$ChooseAirConditionContentVm {
           ..id = item['id']
           ..price = double.tryParse(item['price'] ?? '')
           ..name = item['name']
-          ..num = 1;
+          ..num = 0;
         airConditionListNew.add(newItem);
       });
       return ChooseAirConditionContentState(
@@ -76,7 +76,7 @@ class ChooseAirConditionContentVm extends _$ChooseAirConditionContentVm {
               ..id = item.id
               ..price = (item.price ?? 0.0).toDouble()
               ..name = item.name
-              ..num = 1;
+              ..num = 0;
             airConditionListNew.add(newItem);
           });
 

packages/cpt_services/lib/components/chooseVisitTimeContent.dart

@@ -177,32 +177,35 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
                   bottomRight: 10
                 ): const SizedBox.shrink(),
               ),
-              // 节假日
+              // 夜间
               Positioned(
-                right: 0,
-                top: 0,
-                child: holiday.value? MyTextView(
-                  'Holiday',
-                  textColor: ColorUtils.string2Color("#DD6800"),
+                left: 0,
+                bottom: 2,
+                child: night.value? MyTextView(
+                  'Night',
+                  textColor: ColorUtils.string2Color("#FE4066"),
                   fontSize: 8,
                   isFontRegular: true,
-                  backgroundColor:ColorUtils.string2Color("#FFEBD9"),
+                  backgroundColor: ColorUtils.string2Color("#FE4066").withOpacity(0.2),
                   paddingTop: 2,
                   paddingBottom: 2,
                   paddingLeft: 5,
                   paddingRight: 5,
                 ).clipRRect(
-                    topLeft: 10,
-                    bottomRight: 10
+                    topRight: 10,
+                    bottomLeft: 10
                 ): const SizedBox.shrink(),
               ),
+              // 节假日
               Positioned(
-                child: night.value? MyTextView(
-                  'Night',
-                  textColor: ColorUtils.string2Color("#DD6800"),
+                right: 0,
+                bottom: 2,
+                child: holiday.value? MyTextView(
+                  'Holiday',
+                  textColor: ColorUtils.string2Color("#37d7cc"),
                   fontSize: 8,
                   isFontRegular: true,
-                  backgroundColor:ColorUtils.string2Color("#FFEBD9"),
+                  backgroundColor:ColorUtils.string2Color("#68f1e7").withOpacity(0.2),
                   paddingTop: 2,
                   paddingBottom: 2,
                   paddingLeft: 5,

packages/cpt_services/lib/components/chooseVisitTimeContent_vm.dart

@@ -171,6 +171,7 @@ class ChooseVisitTimeContentVm extends _$ChooseVisitTimeContentVm {
 
     final cleanDetailVm = ref.read(serviceCleanDetailVmProvider.notifier);
     // 结算当前所 预约的价格 （加急/节假日/夜间 等）所有选中的时间段 如果有 紧急、节假日、夜间 则需要加上相应价格
+    // 注意： 如果一个时间段同时设置了多种 预约类型（加急、节假日、夜间） 目前仅算了其中一个的费用 选择的顺序为 加急、节假日、夜间
     final extraCostItemList = state.allSelectedTimeList?.map((item) {
       if (item.urgent ?? false) {
         return cleanDetailVm?.state.urgentPrice ?? 0.0;

packages/cpt_services/lib/modules/services/homeService/home_service_page.dart

@@ -212,7 +212,6 @@ class HomeServicePage extends HookConsumerWidget {
             Log.d("点击了sort");
             vm.handlerClickSortIcon(context);
             expandSortIcon.value = !expandSortIcon.value;
-
           }),
 
           // 排序

packages/cpt_services/lib/modules/services/homeService/home_service_vm.dart

@@ -490,6 +490,7 @@ class HomeServiceVm extends _$HomeServiceVm {
       onPickerChanged: (_, index) {
         state = state.copyWith(sortBySelectedOption: state.sortByOptionsList?[index]);
         // 调用list 接口
+        directRefresh();
       },
     );
   }

packages/cpt_services/lib/modules/services/repair_homeService/home_service_vm.dart

@@ -412,7 +412,6 @@ class RepairHomeServiceVm extends _$RepairHomeServiceVm {
       final result = await servicesRespositoryInstance.fetchServiceLiked(params);
       //校验成功失败
       if (result.isSuccess) {
-        Log.d("4444444");
         // 修改 该id 的 liked 和 likes_count 字段
         state.list!.forEach((RepairServiceList elementEntity) {
 
@@ -475,6 +474,7 @@ class RepairHomeServiceVm extends _$RepairHomeServiceVm {
       onPickerChanged: (_, index) {
         state = state.copyWith(sortBySelectedOption: state.sortByOptionsList?[index]);
         // 调用list 接口
+        directRefresh();
       },
     );
   }

packages/cpt_services/lib/modules/services/service_clean_detail/service_clean_detail_page.dart

@@ -368,7 +368,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
     int? card_id = item.id?? null;
     double card_score = (item.score?? 5.0).toDouble();
     String card_comment = item.comment??"";
-    List<String>? card_resources = item.resources??[];
+    List<String>? card_resources = (item.resources??[]).cast<String>();
     String card_created_at = item.createdAt??"";
     PaidServiceDetailEvaluationsAccount? account=item.account??null;
     String card_name = account?.name??"";
@@ -468,9 +468,11 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
       ) {
     final vm = ref.read(serviceCleanDetailVmProvider.notifier);
 
-    int? likes_count = 0;
-    bool isLiked = false;
-    final contact = '+8613563656325';
+    PaidServiceDetailMerchant? merchant = detailInfo?.merchant??null;
+    final contact = merchant?.contactPhone??"";
+
+    int? likes_count = likesCount?? 0;
+    bool isLiked = liked?? false;
 
     final _likes_count = useState<int>(likes_count!);
     final _isLiked = useState<bool>(isLiked);
@@ -508,7 +510,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
                           Log.d('点击了like button');
                           int id = detailInfo.id!;
                           final isSuccess = await vm.handlerClickLikedBtn(context, id, true);
-                          if(isSuccess!=null && isSuccess){
+                          if(isSuccess!=null && isSuccess == true){
                             // 成功
                             if(_isLiked.value){
                               Log.d("取消点赞");

packages/cpt_services/lib/modules/services/service_clean_detail/service_clean_detail_vm.dart

@@ -11,6 +11,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:plugin_basic/basic_export.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:riverpod_annotation/riverpod_annotation.dart';
 import 'package:router/ext/auto_router_extensions.dart';
@@ -172,18 +173,20 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
 
   // 点击了底部的点赞按钮
   Future<bool?> handlerClickLikedBtn(BuildContext? context, int id, bool isLiked) async{
-    // var vm;
-    // if(_cleanServiceType == "forSale"){
-    //   // vm = ref.read(forsaleVmProvider.notifier);
-    // }else if(_cleanServiceType == "forRent"){
-    //   vm = ref.read(forrentVmProvider.notifier);
-    // }
-    // try {
-    //   final isSuccess = await vm.handlerClickCollection(id, isCollection);
-    //   return isSuccess;
-    // }catch(e){
-    //
-    // }
+    try {
+      Map<String, dynamic> params = {
+        "id": id,
+        "type": 'paid', // 类型(paid=付费服务,inquiry=询价服务)
+      };
+      final result = await serviceRespositoryInstance.fetchServiceLiked(params);
+      if(result.isSuccess){
+        return true;
+      }else{
+        return false;
+      }
+    }catch(e){
+      return false;
+    }
   }
 
   // 判断是whatsapp 还是 mobile  (通过 contact: whatsapp:+8617671757687)
@@ -240,17 +243,19 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
 
   // 拨打电话
   Future<void> makePhoneCall(String phoneNumber) async {
-    final Uri launchUri = Uri(
-      scheme: 'tel',
-      path: phoneNumber,
-    );
-
-    if (await canLaunchUrl(launchUri)) {
-      await launchUrl(launchUri);
-    } else {
-      ToastEngine.show("Could not launch $launchUri");
-      throw 'Could not launch $launchUri';
-    }
+    PermissionEngine().requestCallPhonePermission(() async {
+      final Uri launchUri = Uri(
+        scheme: 'tel',
+        path: phoneNumber,
+      );
+
+      if (await canLaunchUrl(launchUri)) {
+        await launchUrl(launchUri);
+      } else {
+        ToastEngine.show("Could not launch $launchUri");
+        throw 'Could not launch $launchUri';
+      }
+    });
   }
 
   // 点击了 Book Now 按钮
@@ -285,6 +290,7 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
     DialogEngine.show(
         tag: "chooseHouseClean",
         position: DialogPosition.bottom,
+        clickMaskDismiss:false,
         widget: DialogContentWrap(
           key: _chooseHouseCleanDialogGlobalKey,
           loadingState: dialogState,
@@ -300,6 +306,7 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
           // bottomBtnSectionPadding: EdgeInsets.only(left: 20, right: 20, bottom: 20,top: 20),
           yesBtnBg: context.appColors.redDefault,
           noBtnBg: context.appColors.grayBgE9,
+          closeIconColor: context.appColors.textPrimary,
           confirmTxt: "Confirm Selection",
           cancelTxt: "Cancel",
           // yesBtnTextStyle: TextStyle(
@@ -312,6 +319,7 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
           //   fontSize: 17,
           //   fontWeight: FontWeight.w400
           // ),
+          closeAction: (){},
           confirmAction: chooseHouseCleanConfirmFn,
           cancelAction: chooseHouseCleanCancelFn,
           titleBuilder: (context) {
@@ -335,6 +343,7 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
     DialogEngine.show(
       tag: "chooseAirConditionClean",
       position: DialogPosition.bottom,
+        clickMaskDismiss:false ,
       widget: DialogContentWrap(
         key: _chooseAirCleanDialogGlobalKey,
         loadingState: dialogState,
@@ -348,6 +357,7 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
         topLeftRadius: 20.0,
         topRightRadius: 20.0,
         // bottomBtnSectionPadding: EdgeInsets.only(left: 20, right: 20, bottom: 20,top: 20),
+        closeIconColor: context.appColors.textPrimary,
         yesBtnBg: context.appColors.redDefault,
         noBtnBg: context.appColors.grayBgE9,
         confirmTxt: "Confirm Selection",
@@ -363,6 +373,7 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
         //   fontWeight: FontWeight.w400
         // ),
         isConfirmAutoClose: false,
+        closeAction: () {},
         confirmAction: chooseAirConditionConfirmFn,
         cancelAction: chooseAirConditionCancelFn,
         titleBuilder: (context) {

packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_vm.dart

@@ -5,6 +5,7 @@ import 'package:domain/entity/service_repair_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:plugin_basic/basic_export.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:riverpod_annotation/riverpod_annotation.dart';
 import 'package:router/ext/auto_router_extensions.dart';
@@ -206,12 +207,9 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   // 点击 whatsapp
   handlerClickWhatsapp(
       BuildContext? context, String contactType, String title, int price) {
-    // 假设你有一个获取 WhatsApp 号码的方法
     String whatsappNumber = getContactNumber(contactType); // 你需要实现这个方法
-    // 构建消息并进行编码
     String message = Uri.encodeComponent(
         "Hello, I am interested in your listing: $title for $price.");
-    // 打开WhatsApp
     openWhatsApp(whatsappNumber, message);
   }
 
@@ -230,28 +228,33 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   handlerClickMobile(BuildContext? context, String contactType) {
     String mobileNumber = getContactNumber(contactType);
     // 拨打电话
-    makePhoneCall(mobileNumber);
+    PermissionEngine().requestCallPhonePermission(() async {
+      // 拨打电话
+      makePhoneCall(mobileNumber);
+    });
   }
 
   // 拨打电话
   Future<void> makePhoneCall(String phoneNumber) async {
-    final Uri launchUri = Uri(
-      scheme: 'tel',
-      path: phoneNumber,
-    );
-
-    if (await canLaunchUrl(launchUri)) {
-      await launchUrl(launchUri);
-    } else {
-      ToastEngine.show("Could not launch $launchUri");
-      throw 'Could not launch $launchUri';
-    }
+    PermissionEngine().requestCallPhonePermission(() async {
+      final Uri launchUri = Uri(
+        scheme: 'tel',
+        path: phoneNumber,
+      );
+
+      if (await canLaunchUrl(launchUri)) {
+        await launchUrl(launchUri);
+      } else {
+        ToastEngine.show("Could not launch $launchUri");
+        throw 'Could not launch $launchUri';
+      }
+    });
   }
 
   Future RepairServiceSubmit<T>(
       BuildContext context, int id) async {
     try {
-      Map<String, dynamic> params = {"service_id": id, "user_notes": ""};
+      Map<String, dynamic> params = {"service_id": id, "user_notes": "test"};
       final result =
           await serviceRespositoryInstance.fetchRepairServiceSubmit(params);
       if (result.isSuccess) {

packages/cpt_services/lib/respository/services_respository.dart

@@ -131,8 +131,7 @@ class ServicesRespository {
     // headers["Accept"] = "application/x.yyjobs-api.v1+json";
 
     final result = await dioEngine.requestNetResult(
-      // ApiConstants.apiServerTime, // api 地址
-      '/api/v1/user/service/paid-service/liked', // api 地址
+      '/api/v1/user/service/like/click', // api 地址
       params: params,
       headers: headers,
       method: HttpMethod.POST,
@@ -145,9 +144,9 @@ class ServicesRespository {
     //根据返回的结果，封装原始数据为Bean/Entity对象
     if (result.isSuccess) {
       //重新赋值data或list
-      final json = result.getDataDynamic();
+      final boolData = result.getDataDynamic();
       //重新赋值data或list
-      return result.convert(data: json);
+      return result.convert(data: boolData);
     } else {
       if (result.errorMsg != null && result.errorMsg!.isNotEmpty) {
         ToastEngine.show("${result.errorMsg}");

packages/cs_domain/lib/entity/paid_service_detail_entity.dart

@@ -16,7 +16,7 @@ class PaidServiceDetailEntity {
 	@JSONField(name: "holiday_price")
 	int? holidayPrice;
 	@JSONField(name: "night_price")
-	double? nightPrice;
+	int? nightPrice;
 	@JSONField(name: "service_period_start")
 	String? servicePeriodStart;
 	@JSONField(name: "service_period_end")
@@ -45,6 +45,8 @@ class PaidServiceDetailEntity {
 class PaidServiceDetailMerchant {
 	int? id;
 	String? name;
+	@JSONField(name: "contact_phone")
+	String? contactPhone;
 
 	PaidServiceDetailMerchant();
 
@@ -101,7 +103,7 @@ class PaidServiceDetailEvaluations {
 	int? id;
 	int? score;
 	String? comment;
-	List<String>? resources;
+	List<dynamic>? resources;
 	PaidServiceDetailEvaluationsAccount? account;
 	@JSONField(name: "created_at")
 	String? createdAt;

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

@@ -7,16 +7,22 @@ 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;
   }
@@ -47,9 +53,11 @@ 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;
   }
@@ -57,14 +65,16 @@ FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(Map<String, dynamic>
   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;
@@ -85,7 +95,8 @@ 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) {
@@ -95,15 +106,19 @@ FacilityBookFacilities $FacilityBookFacilitiesFromJson(Map<String, dynamic> json
   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;
@@ -124,7 +139,8 @@ 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) {
@@ -157,7 +173,8 @@ FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(Map<String,
   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,8 +15,10 @@ 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,12 +19,15 @@ 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;
   }
@@ -63,19 +66,23 @@ extension FacilityPageEntityExtension on FacilityPageEntity {
 
 FacilityDetail $FacilityDetailFromJson(Map<String, dynamic> json) {
   final FacilityDetail facilityDetail = FacilityDetail();
-  final FacilityPageListBooking? booking = jsonConvert.convert<FacilityPageListBooking>(json['booking']);
+  final FacilityPageListBooking? booking = jsonConvert.convert<
+      FacilityPageListBooking>(json['booking']);
   if (booking != null) {
     facilityDetail.booking = booking;
   }
-  final FacilityPageListFacility? facility = jsonConvert.convert<FacilityPageListFacility>(json['facility']);
+  final FacilityPageListFacility? facility = jsonConvert.convert<
+      FacilityPageListFacility>(json['facility']);
   if (facility != null) {
     facilityDetail.facility = facility;
   }
-  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<FacilityPageListTimePeriod>(json['time_period']);
+  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<
+      FacilityPageListTimePeriod>(json['time_period']);
   if (timePeriod != null) {
     facilityDetail.timePeriod = timePeriod;
   }
-  final FacilityPageListAccount? account = jsonConvert.convert<FacilityPageListAccount>(json['account']);
+  final FacilityPageListAccount? account = jsonConvert.convert<
+      FacilityPageListAccount>(json['account']);
   if (account != null) {
     facilityDetail.account = account;
   }
@@ -106,7 +113,8 @@ 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) {
@@ -128,18 +136,21 @@ FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> js
   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;
@@ -172,7 +183,8 @@ 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) {
@@ -182,14 +194,16 @@ FacilityPageListFacility $FacilityPageListFacilityFromJson(Map<String, dynamic>
   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;
@@ -210,7 +224,8 @@ 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) {
@@ -223,7 +238,8 @@ FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(Map<String, d
   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;
@@ -241,7 +257,8 @@ 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) {
@@ -254,7 +271,8 @@ FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(Map<String, dynam
   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;
@@ -272,7 +290,8 @@ 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) {
@@ -285,7 +304,8 @@ FacilityPageListAccount $FacilityPageListAccountFromJson(Map<String, dynamic> js
   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,12 +30,17 @@ 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;
   }
@@ -78,7 +83,8 @@ 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) {
@@ -97,14 +103,16 @@ FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json)
   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,8 +21,11 @@ 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;
   }
@@ -78,7 +81,8 @@ 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,20 +5,25 @@ 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;
   }
@@ -30,11 +35,13 @@ 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;
   }
@@ -42,7 +49,8 @@ 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;
   }
@@ -54,27 +62,33 @@ 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;
   }
@@ -82,31 +96,38 @@ 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;
   }
@@ -183,7 +204,8 @@ 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
@@ -199,6 +221,7 @@ 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,7 +13,8 @@ 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,7 +7,8 @@ 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,12 +3,14 @@ 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,11 +15,13 @@ 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;
   }
@@ -35,11 +37,13 @@ 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;
   }
@@ -85,7 +89,8 @@ 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) {
@@ -106,7 +111,8 @@ FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String,
   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,7 +3,8 @@ 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) {
@@ -21,15 +22,19 @@ FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> js
   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,7 +3,8 @@ 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) {
@@ -21,15 +22,19 @@ GarageSaleHistoryEntity $GarageSaleHistoryEntityFromJson(Map<String, dynamic> js
   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;
@@ -56,7 +61,8 @@ 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) {
@@ -74,23 +80,30 @@ GarageSaleHistoryList $GarageSaleHistoryListFromJson(Map<String, dynamic> json)
   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;
@@ -123,7 +136,8 @@ 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) {
@@ -141,14 +155,16 @@ GarageSaleHistoryListOrderProducts $GarageSaleHistoryListOrderProductsFromJson(M
   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,7 +1,8 @@
 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) {
@@ -36,14 +37,16 @@ GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(Map<String, dynam
   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;
@@ -82,7 +85,8 @@ 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) {
@@ -99,7 +103,8 @@ GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(Map<String, dyn
   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,8 +19,11 @@ 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;
   }
@@ -85,7 +88,8 @@ 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;
   }
@@ -128,7 +132,8 @@ 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) {
@@ -145,7 +150,8 @@ GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(Map<String, dynamic
   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,23 +3,39 @@ 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;
   }
@@ -29,9 +45,11 @@ 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;
 }
 
@@ -46,7 +64,8 @@ extension HomeListEntityExtension on HomeListEntity {
       ..banners = banners ?? this.banners
       ..latestTransactions = latestTransactions ?? this.latestTransactions
       ..propertyNews = propertyNews ?? this.propertyNews
-      ..strataManagementGuides = strataManagementGuides ?? this.strataManagementGuides;
+      ..strataManagementGuides = strataManagementGuides ??
+          this.strataManagementGuides;
   }
 }
 
@@ -88,7 +107,8 @@ 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) {
@@ -113,7 +133,8 @@ HomeListLatestTransactions $HomeListLatestTransactionsFromJson(Map<String, dynam
   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,7 +1,8 @@
 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) {
@@ -30,7 +31,8 @@ LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(Map<String, dynamic> json
   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,8 +19,10 @@ 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,7 +1,8 @@
 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) {
@@ -18,7 +19,8 @@ MyfollowingListEntity $MyfollowingListEntityFromJson(Map<String, dynamic> json)
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,19 @@ MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(Map<String, dynamic> json)
   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;
@@ -85,7 +90,8 @@ 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;
   }
@@ -128,7 +134,8 @@ 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) {
@@ -149,7 +156,8 @@ MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(Map<String, dynam
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,19 @@ MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(Map<String, dynamic> json)
   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,7 +1,8 @@
 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) {
@@ -18,7 +19,8 @@ NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, d
   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,12 +40,17 @@ 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;
   }
@@ -97,7 +102,8 @@ 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) {
@@ -118,7 +124,8 @@ NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json)
   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;
@@ -142,7 +149,8 @@ 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) {
@@ -156,18 +164,21 @@ NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json
   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;
@@ -194,7 +205,8 @@ 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) {
@@ -211,7 +223,8 @@ NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String,
   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;
@@ -232,7 +245,8 @@ 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) {
@@ -249,7 +263,8 @@ NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<Str
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,19 @@ NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> js
   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;
@@ -54,7 +59,8 @@ 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) {
@@ -85,14 +91,16 @@ NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json)
   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;
@@ -128,7 +136,8 @@ 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) {
@@ -149,7 +158,8 @@ NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, d
   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,8 +19,11 @@ 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;
   }
@@ -85,7 +88,8 @@ 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;
   }
@@ -128,7 +132,8 @@ 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) {
@@ -149,7 +154,8 @@ NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic
   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,8 +19,10 @@ 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;
   }
@@ -85,7 +87,8 @@ 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;
   }
@@ -128,7 +131,8 @@ 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) {
@@ -149,7 +153,8 @@ NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> js
   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,7 +1,8 @@
 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) {
@@ -27,7 +28,8 @@ NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(Map<String,
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,19 @@ NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(Map<String, dynamic> js
   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;
@@ -54,7 +59,8 @@ 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) {
@@ -71,7 +77,8 @@ NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(Map<String, dynamic> json)
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,20 @@ NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(Map<String, dynam
   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;
@@ -54,7 +60,8 @@ 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) {
@@ -75,7 +82,8 @@ NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(Map<String, dynamic>
   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,7 +1,8 @@
 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) {
@@ -31,7 +32,8 @@ NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(Map<String, d
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,19 @@ NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(Map<String, dynamic> json
   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,7 +1,8 @@
 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) {
@@ -16,7 +17,8 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> js
   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;
   }
@@ -32,19 +34,22 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> js
   if (holidayPrice != null) {
     paidServiceDetailEntity.holidayPrice = holidayPrice;
   }
-  final double? nightPrice = jsonConvert.convert<double>(json['night_price']);
+  final int? nightPrice = jsonConvert.convert<int>(json['night_price']);
   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;
   }
@@ -52,28 +57,38 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> js
   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;
@@ -103,7 +118,7 @@ extension PaidServiceDetailEntityExtension on PaidServiceDetailEntity {
     String? highlight,
     int? urgentPrice,
     int? holidayPrice,
-    double? nightPrice,
+    int? nightPrice,
     String? servicePeriodStart,
     String? servicePeriodEnd,
     int? servicePeriodInterval,
@@ -124,7 +139,8 @@ 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
@@ -133,7 +149,8 @@ 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) {
@@ -143,13 +160,20 @@ PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(Map<String, dynamic
   if (name != null) {
     paidServiceDetailMerchant.name = name;
   }
+  final String? contactPhone = jsonConvert.convert<String>(
+      json['contact_phone']);
+  if (contactPhone != null) {
+    paidServiceDetailMerchant.contactPhone = contactPhone;
+  }
   return paidServiceDetailMerchant;
 }
 
-Map<String, dynamic> $PaidServiceDetailMerchantToJson(PaidServiceDetailMerchant entity) {
+Map<String, dynamic> $PaidServiceDetailMerchantToJson(
+    PaidServiceDetailMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
+  data['contact_phone'] = entity.contactPhone;
   return data;
 }
 
@@ -157,14 +181,17 @@ extension PaidServiceDetailMerchantExtension on PaidServiceDetailMerchant {
   PaidServiceDetailMerchant copyWith({
     int? id,
     String? name,
+    String? contactPhone,
   }) {
     return PaidServiceDetailMerchant()
       ..id = id ?? this.id
-      ..name = name ?? this.name;
+      ..name = name ?? this.name
+      ..contactPhone = contactPhone ?? this.contactPhone;
   }
 }
 
-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) {
@@ -181,7 +208,8 @@ PaidServiceDetailCategory $PaidServiceDetailCategoryFromJson(Map<String, dynamic
   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;
@@ -202,7 +230,8 @@ 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) {
@@ -212,7 +241,8 @@ PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(Map<String, dynamic
   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;
   }
@@ -223,7 +253,8 @@ PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(Map<String, dynamic
   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;
@@ -247,7 +278,8 @@ 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) {
@@ -261,12 +293,13 @@ PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(Map<String, d
   if (comment != null) {
     paidServiceDetailEvaluations.comment = comment;
   }
-  final List<String>? resources = (json['resources'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<String>(e) as String).toList();
+  final List<dynamic>? resources = (json['resources'] as List<dynamic>?)?.map(
+          (e) => e).toList();
   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;
   }
@@ -277,7 +310,8 @@ PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(Map<String, d
   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;
@@ -293,7 +327,7 @@ extension PaidServiceDetailEvaluationsExtension on PaidServiceDetailEvaluations
     int? id,
     int? score,
     String? comment,
-    List<String>? resources,
+    List<dynamic>? resources,
     PaidServiceDetailEvaluationsAccount? account,
     String? createdAt,
   }) {
@@ -307,7 +341,8 @@ 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) {
@@ -324,7 +359,8 @@ 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,8 +19,10 @@ 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;
   }
@@ -81,11 +83,13 @@ 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;
   }
@@ -128,7 +132,8 @@ 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) {
@@ -141,7 +146,8 @@ PaidServiceListMerchant $PaidServiceListMerchantFromJson(Map<String, dynamic> js
   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;
@@ -159,7 +165,8 @@ 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) {
@@ -176,7 +183,8 @@ PaidServiceListCategory $PaidServiceListCategoryFromJson(Map<String, dynamic> js
   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,7 +1,8 @@
 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) {
@@ -23,38 +24,46 @@ PaidServicePaySuccessInfoEntity $PaidServicePaySuccessInfoEntityFromJson(Map<Str
   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;
@@ -102,7 +111,8 @@ 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) {
@@ -123,7 +133,8 @@ PaidServicePaySuccessInfoAccount $PaidServicePaySuccessInfoAccountFromJson(Map<S
   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;
@@ -147,7 +158,8 @@ 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) {
@@ -157,14 +169,17 @@ 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;
@@ -185,7 +200,8 @@ 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) {
@@ -195,14 +211,16 @@ PaidServicePaySuccessInfoMerchant $PaidServicePaySuccessInfoMerchantFromJson(Map
   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;
@@ -223,7 +241,8 @@ 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) {
@@ -240,7 +259,8 @@ PaidServicePaySuccessInfoStaff $PaidServicePaySuccessInfoStaffFromJson(Map<Strin
   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;
@@ -261,7 +281,8 @@ 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) {
@@ -279,14 +300,16 @@ 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;
@@ -313,7 +336,8 @@ 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) {
@@ -326,7 +350,8 @@ PaidServicePaySuccessInfoEstate $PaidServicePaySuccessInfoEstateFromJson(Map<Str
   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;
@@ -344,7 +369,8 @@ 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) {
@@ -361,7 +387,8 @@ 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,8 +19,10 @@ 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,7 +1,8 @@
 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) {
@@ -34,7 +35,8 @@ PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(Map<String, dynamic>
   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,8 +19,10 @@ 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,7 +1,8 @@
 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) {
@@ -19,15 +20,19 @@ PropertySaleRentEntity $PropertySaleRentEntityFromJson(Map<String, dynamic> json
   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,8 +19,10 @@ 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;
   }
@@ -72,11 +74,13 @@ 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;
   }
@@ -113,7 +117,8 @@ 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) {
@@ -126,7 +131,8 @@ RepairServiceListMerchant $RepairServiceListMerchantFromJson(Map<String, dynamic
   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;
@@ -144,7 +150,8 @@ 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) {
@@ -161,7 +168,8 @@ RepairServiceListCategory $RepairServiceListCategoryFromJson(Map<String, dynamic
   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,16 +1,19 @@
 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;
@@ -25,13 +28,15 @@ 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;
   }
@@ -51,18 +56,21 @@ RewardsActiveDetailData $RewardsActiveDetailDataFromJson(Map<String, dynamic> js
   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;
@@ -98,7 +106,8 @@ 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) {
@@ -115,7 +124,8 @@ RewardsActiveDetailDataAccount $RewardsActiveDetailDataAccountFromJson(Map<Strin
   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;
@@ -136,7 +146,8 @@ 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) {
@@ -159,7 +170,8 @@ RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(Map<String,
   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;
   }
@@ -170,7 +182,8 @@ RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(Map<String,
   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,7 +11,8 @@ 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;
   }
@@ -78,7 +79,8 @@ 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;
   }
@@ -98,8 +100,12 @@ 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;
   }
@@ -163,7 +169,8 @@ 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) {
@@ -176,7 +183,8 @@ RewardsBuyRewardRedeemable $RewardsBuyRewardRedeemableFromJson(Map<String, dynam
   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,7 +1,8 @@
 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) {
@@ -18,7 +19,8 @@ RewardsCategoryEntity $RewardsCategoryEntityFromJson(Map<String, dynamic> json)
   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,7 +40,8 @@ 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;
   }
@@ -60,8 +61,11 @@ 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;
   }
@@ -125,7 +129,8 @@ 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) {
@@ -138,7 +143,8 @@ RewardsDetailRedeemable $RewardsDetailRedeemableFromJson(Map<String, dynamic> js
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,20 @@ RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(Map<String, dynam
   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;
@@ -54,7 +60,8 @@ 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) {
@@ -64,7 +71,8 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(Map<String, dynamic>
   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;
   }
@@ -75,7 +83,8 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(Map<String, dynamic>
   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,8 +3,10 @@ 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;
   }
@@ -50,8 +52,12 @@ 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;
   }
@@ -79,7 +85,8 @@ 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) {
@@ -105,7 +112,8 @@ RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(Map<String, dynamic> json
   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,8 +11,12 @@ 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;
   }
@@ -40,7 +44,8 @@ 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) {
@@ -55,7 +60,8 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(Map<String, dynamic> json)
   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;
   }
@@ -66,7 +72,8 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(Map<String, dynamic> json)
   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,7 +1,8 @@
 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) {
@@ -19,7 +20,8 @@ RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(Map<String, dynamic> json)
   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,11 +7,13 @@ 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;
   }
@@ -47,13 +49,16 @@ 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;
@@ -61,7 +66,8 @@ RewardsIndexContinuous $RewardsIndexContinuousFromJson(Map<String, dynamic> json
   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,8 +19,10 @@ 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,7 +1,8 @@
 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) {
@@ -27,18 +28,21 @@ RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(Map<String, dynamic> json)
   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;
@@ -74,7 +78,8 @@ 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) {
@@ -91,7 +96,8 @@ RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(Map<String, dynamic> json
   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;
@@ -112,7 +118,8 @@ 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) {
@@ -135,7 +142,8 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(Map<String, dynamic> json)
   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;
   }
@@ -146,7 +154,8 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(Map<String, dynamic> json)
   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,8 +19,10 @@ 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;
   }
@@ -68,7 +70,8 @@ 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;
   }
@@ -122,7 +125,8 @@ 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,8 +13,12 @@ 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,7 +1,8 @@
 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) {
@@ -22,7 +23,8 @@ ServiceCategoryEntity $ServiceCategoryEntityFromJson(Map<String, dynamic> json)
   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,7 +1,8 @@
 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) {
@@ -19,15 +20,20 @@ ServiceEvaluateListEntity $ServiceEvaluateListEntityFromJson(Map<String, dynamic
   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;
@@ -54,13 +60,15 @@ 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;
   }
@@ -84,7 +92,8 @@ ServiceEvaluateListList $ServiceEvaluateListListFromJson(Map<String, dynamic> js
   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();
@@ -114,7 +123,8 @@ 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) {
@@ -131,7 +141,8 @@ ServiceEvaluateListListAccount $ServiceEvaluateListListAccountFromJson(Map<Strin
   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,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/service_order_detail_entity.dart';
 
-ServiceOrderDetailEntity $ServiceOrderDetailEntityFromJson(Map<String, dynamic> json) {
+ServiceOrderDetailEntity $ServiceOrderDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final ServiceOrderDetailEntity serviceOrderDetailEntity = ServiceOrderDetailEntity();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -23,39 +24,50 @@ ServiceOrderDetailEntity $ServiceOrderDetailEntityFromJson(Map<String, dynamic>
   if (notes != null) {
     serviceOrderDetailEntity.notes = notes;
   }
-  final ServiceOrderDetailAccount? account = jsonConvert.convert<ServiceOrderDetailAccount>(json['account']);
+  final ServiceOrderDetailAccount? account = jsonConvert.convert<
+      ServiceOrderDetailAccount>(json['account']);
   if (account != null) {
     serviceOrderDetailEntity.account = account;
   }
-  final ServiceOrderDetailOrderService? orderService = jsonConvert.convert<ServiceOrderDetailOrderService>(json['order_service']);
+  final ServiceOrderDetailOrderService? orderService = jsonConvert.convert<
+      ServiceOrderDetailOrderService>(json['order_service']);
   if (orderService != null) {
     serviceOrderDetailEntity.orderService = orderService;
   }
-  final ServiceOrderDetailMerchant? merchant = jsonConvert.convert<ServiceOrderDetailMerchant>(json['merchant']);
+  final ServiceOrderDetailMerchant? merchant = jsonConvert.convert<
+      ServiceOrderDetailMerchant>(json['merchant']);
   if (merchant != null) {
     serviceOrderDetailEntity.merchant = merchant;
   }
-  final ServiceOrderDetailStaff? staff = jsonConvert.convert<ServiceOrderDetailStaff>(json['staff']);
+  final ServiceOrderDetailStaff? staff = jsonConvert.convert<
+      ServiceOrderDetailStaff>(json['staff']);
   if (staff != null) {
     serviceOrderDetailEntity.staff = staff;
   }
-  final List<ServiceOrderDetailOrderProducts>? orderProducts = (json['order_products'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<ServiceOrderDetailOrderProducts>(e) as ServiceOrderDetailOrderProducts).toList();
+  final List<
+      ServiceOrderDetailOrderProducts>? orderProducts = (json['order_products'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<ServiceOrderDetailOrderProducts>(
+          e) as ServiceOrderDetailOrderProducts).toList();
   if (orderProducts != null) {
     serviceOrderDetailEntity.orderProducts = orderProducts;
   }
-  final ServiceOrderDetailEstate? estate = jsonConvert.convert<ServiceOrderDetailEstate>(json['estate']);
+  final ServiceOrderDetailEstate? estate = jsonConvert.convert<
+      ServiceOrderDetailEstate>(json['estate']);
   if (estate != null) {
     serviceOrderDetailEntity.estate = estate;
   }
-  final ServiceOrderDetailEstateUnit? estateUnit = jsonConvert.convert<ServiceOrderDetailEstateUnit>(json['estate_unit']);
+  final ServiceOrderDetailEstateUnit? estateUnit = jsonConvert.convert<
+      ServiceOrderDetailEstateUnit>(json['estate_unit']);
   if (estateUnit != null) {
     serviceOrderDetailEntity.estateUnit = estateUnit;
   }
   return serviceOrderDetailEntity;
 }
 
-Map<String, dynamic> $ServiceOrderDetailEntityToJson(ServiceOrderDetailEntity entity) {
+Map<String, dynamic> $ServiceOrderDetailEntityToJson(
+    ServiceOrderDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['sn'] = entity.sn;
@@ -66,7 +78,8 @@ Map<String, dynamic> $ServiceOrderDetailEntityToJson(ServiceOrderDetailEntity en
   data['order_service'] = entity.orderService?.toJson();
   data['merchant'] = entity.merchant?.toJson();
   data['staff'] = entity.staff?.toJson();
-  data['order_products'] = entity.orderProducts?.map((v) => v.toJson()).toList();
+  data['order_products'] =
+      entity.orderProducts?.map((v) => v.toJson()).toList();
   data['estate'] = entity.estate?.toJson();
   data['estate_unit'] = entity.estateUnit?.toJson();
   return data;
@@ -103,7 +116,8 @@ extension ServiceOrderDetailEntityExtension on ServiceOrderDetailEntity {
   }
 }
 
-ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(Map<String, dynamic> json) {
+ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(
+    Map<String, dynamic> json) {
   final ServiceOrderDetailAccount serviceOrderDetailAccount = ServiceOrderDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -124,7 +138,8 @@ ServiceOrderDetailAccount $ServiceOrderDetailAccountFromJson(Map<String, dynamic
   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;
@@ -148,7 +163,8 @@ extension ServiceOrderDetailAccountExtension on ServiceOrderDetailAccount {
   }
 }
 
-ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(Map<String, dynamic> json) {
+ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(
+    Map<String, dynamic> json) {
   final ServiceOrderDetailOrderService serviceOrderDetailOrderService = ServiceOrderDetailOrderService();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -158,14 +174,16 @@ ServiceOrderDetailOrderService $ServiceOrderDetailOrderServiceFromJson(Map<Strin
   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;
@@ -186,7 +204,8 @@ extension ServiceOrderDetailOrderServiceExtension on ServiceOrderDetailOrderServ
   }
 }
 
-ServiceOrderDetailMerchant $ServiceOrderDetailMerchantFromJson(Map<String, dynamic> json) {
+ServiceOrderDetailMerchant $ServiceOrderDetailMerchantFromJson(
+    Map<String, dynamic> json) {
   final ServiceOrderDetailMerchant serviceOrderDetailMerchant = ServiceOrderDetailMerchant();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -196,14 +215,16 @@ ServiceOrderDetailMerchant $ServiceOrderDetailMerchantFromJson(Map<String, dynam
   if (name != null) {
     serviceOrderDetailMerchant.name = name;
   }
-  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
+  final String? contactPhone = jsonConvert.convert<String>(
+      json['contact_phone']);
   if (contactPhone != null) {
     serviceOrderDetailMerchant.contactPhone = contactPhone;
   }
   return serviceOrderDetailMerchant;
 }
 
-Map<String, dynamic> $ServiceOrderDetailMerchantToJson(ServiceOrderDetailMerchant entity) {
+Map<String, dynamic> $ServiceOrderDetailMerchantToJson(
+    ServiceOrderDetailMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -224,7 +245,8 @@ extension ServiceOrderDetailMerchantExtension on ServiceOrderDetailMerchant {
   }
 }
 
-ServiceOrderDetailStaff $ServiceOrderDetailStaffFromJson(Map<String, dynamic> json) {
+ServiceOrderDetailStaff $ServiceOrderDetailStaffFromJson(
+    Map<String, dynamic> json) {
   final ServiceOrderDetailStaff serviceOrderDetailStaff = ServiceOrderDetailStaff();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -241,7 +263,8 @@ ServiceOrderDetailStaff $ServiceOrderDetailStaffFromJson(Map<String, dynamic> js
   return serviceOrderDetailStaff;
 }
 
-Map<String, dynamic> $ServiceOrderDetailStaffToJson(ServiceOrderDetailStaff entity) {
+Map<String, dynamic> $ServiceOrderDetailStaffToJson(
+    ServiceOrderDetailStaff entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -262,7 +285,8 @@ extension ServiceOrderDetailStaffExtension on ServiceOrderDetailStaff {
   }
 }
 
-ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(Map<String, dynamic> json) {
+ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(
+    Map<String, dynamic> json) {
   final ServiceOrderDetailOrderProducts serviceOrderDetailOrderProducts = ServiceOrderDetailOrderProducts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -272,15 +296,18 @@ ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(Map<Str
   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;
   }
@@ -296,14 +323,16 @@ ServiceOrderDetailOrderProducts $ServiceOrderDetailOrderProductsFromJson(Map<Str
   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;
@@ -342,7 +371,8 @@ 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) {
@@ -355,7 +385,8 @@ ServiceOrderDetailEstate $ServiceOrderDetailEstateFromJson(Map<String, dynamic>
   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;
@@ -373,7 +404,8 @@ 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) {
@@ -390,7 +422,8 @@ ServiceOrderDetailEstateUnit $ServiceOrderDetailEstateUnitFromJson(Map<String, d
   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,7 +1,8 @@
 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) {
@@ -15,18 +16,21 @@ ServiceRepairDetailEntity $ServiceRepairDetailEntityFromJson(Map<String, dynamic
   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;
@@ -53,7 +57,8 @@ 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) {
@@ -66,7 +71,8 @@ ServiceRepairDetailMerchant $ServiceRepairDetailMerchantFromJson(Map<String, dyn
   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;
@@ -84,7 +90,8 @@ 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) {
@@ -101,7 +108,8 @@ ServiceRepairDetailCategory $ServiceRepairDetailCategoryFromJson(Map<String, dyn
   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,7 +1,8 @@
 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) {
@@ -30,7 +31,8 @@ ServiceTimePeriodEntity $ServiceTimePeriodEntityFromJson(Map<String, dynamic> js
   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,11 +23,13 @@ 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;
   }
@@ -35,21 +37,28 @@ 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;
   }
@@ -152,8 +161,12 @@ 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;
   }
@@ -181,7 +194,8 @@ 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) {
@@ -207,14 +221,16 @@ UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(Map<String, dynamic> json)
   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;
@@ -247,7 +263,8 @@ 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) {
@@ -272,7 +289,8 @@ UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(Map<String, dynamic
   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,8 +19,10 @@ 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;
   }
@@ -72,7 +74,8 @@ 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_widgets/lib/my_cart_num.dart

@@ -6,7 +6,7 @@ class MyCartNum extends StatefulWidget {
   final int initialNum;
   final ValueChanged<int> onChange; // 添加回调函数
 
-  MyCartNum({Key? key, this.initialNum = 1, required this.onChange}) : super(key: key);
+  MyCartNum({Key? key, this.initialNum = 0, required this.onChange}) : super(key: key);
 
   @override
   _MyCartNumState createState() => _MyCartNumState();