解决冲突，运行成功

packages/cpt_notice_board/pubspec.yaml

@@ -47,9 +47,6 @@ dependencies:
   # Hooks 简化 Riverpod 获取
   hooks_riverpod: ^2.5.1
 
-  flutter_html: ^2.1.0
-  cached_network_image: ^3.1.0
-  url_launcher: ^6.1.0
 
 dev_dependencies:
   flutter_test:

packages/cs_domain/lib/generated/json/base/json_convert_content.dart

@@ -367,18 +367,32 @@ class JsonConvert {
     if (<NewsfeedNewsListAccount>[] is M) {
       return data.map<NewsfeedNewsListAccount>((Map<String, dynamic> e) => NewsfeedNewsListAccount.fromJson(e)).toList() as M;
     }
+    if (<NoticeBoardAnnounDetailEntity>[] is M) {
+      return data.map<NoticeBoardAnnounDetailEntity>((Map<String, dynamic> e) => NoticeBoardAnnounDetailEntity.fromJson(e)).toList() as M;
+    }
     if (<NoticeBoardAnnounEntity>[] is M) {
       return data.map<NoticeBoardAnnounEntity>((Map<String, dynamic> e) => NoticeBoardAnnounEntity.fromJson(e)).toList() as M;
     }
+    if (<NoticeBoardAnnounList>[] is M) {
+      return data.map<NoticeBoardAnnounList>((Map<String, dynamic> e) => NoticeBoardAnnounList.fromJson(e)).toList() as M;
+    }
     if (<NoticeBoardDocumentsEntity>[] is M) {
       return data.map<NoticeBoardDocumentsEntity>((Map<String, dynamic> e) => NoticeBoardDocumentsEntity.fromJson(e)).toList() as M;
     }
+    if (<NoticeBoardDocumentsList>[] is M) {
+      return data.map<NoticeBoardDocumentsList>((Map<String, dynamic> e) => NoticeBoardDocumentsList.fromJson(e)).toList() as M;
+    }
+    if (<NoticeBoardEventDetailEntity>[] is M) {
+      return data.map<NoticeBoardEventDetailEntity>((Map<String, dynamic> e) => NoticeBoardEventDetailEntity.fromJson(e)).toList() as M;
+    }
     if (<NoticeBoardEventEntity>[] is M) {
       return data.map<NoticeBoardEventEntity>((Map<String, dynamic> e) => NoticeBoardEventEntity.fromJson(e)).toList() as M;
     }
+    if (<NoticeBoardEventList>[] is M) {
+      return data.map<NoticeBoardEventList>((Map<String, dynamic> e) => NoticeBoardEventList.fromJson(e)).toList() as M;
+    }
     if (<PaymentPageEntity>[] is M) {
-      return data.map<PaymentPageEntity>((Map<String, dynamic> e) =>
-          PaymentPageEntity.fromJson(e)).toList() as M;
+      return data.map<PaymentPageEntity>((Map<String, dynamic> e) => PaymentPageEntity.fromJson(e)).toList() as M;
     }
     if (<PaymentPageList>[] is M) {
       return data.map<PaymentPageList>((Map<String, dynamic> e) => PaymentPageList.fromJson(e)).toList() as M;
@@ -398,12 +412,42 @@ class JsonConvert {
     if (<PropertySaleRentList>[] is M) {
       return data.map<PropertySaleRentList>((Map<String, dynamic> e) => PropertySaleRentList.fromJson(e)).toList() as M;
     }
+    if (<RewardsActiveDetailEntity>[] is M) {
+      return data.map<RewardsActiveDetailEntity>((Map<String, dynamic> e) => RewardsActiveDetailEntity.fromJson(e)).toList() as M;
+    }
+    if (<RewardsActiveDetailData>[] is M) {
+      return data.map<RewardsActiveDetailData>((Map<String, dynamic> e) => RewardsActiveDetailData.fromJson(e)).toList() as M;
+    }
+    if (<RewardsActiveDetailDataAccount>[] is M) {
+      return data.map<RewardsActiveDetailDataAccount>((Map<String, dynamic> e) => RewardsActiveDetailDataAccount.fromJson(e)).toList() as M;
+    }
+    if (<RewardsActiveDetailDataReward>[] is M) {
+      return data.map<RewardsActiveDetailDataReward>((Map<String, dynamic> e) => RewardsActiveDetailDataReward.fromJson(e)).toList() as M;
+    }
+    if (<RewardsBuyEntity>[] is M) {
+      return data.map<RewardsBuyEntity>((Map<String, dynamic> e) => RewardsBuyEntity.fromJson(e)).toList() as M;
+    }
+    if (<RewardsBuyReward>[] is M) {
+      return data.map<RewardsBuyReward>((Map<String, dynamic> e) => RewardsBuyReward.fromJson(e)).toList() as M;
+    }
+    if (<RewardsBuyRewardRedeemable>[] is M) {
+      return data.map<RewardsBuyRewardRedeemable>((Map<String, dynamic> e) => RewardsBuyRewardRedeemable.fromJson(e)).toList() as M;
+    }
     if (<RewardsCategoryEntity>[] is M) {
       return data.map<RewardsCategoryEntity>((Map<String, dynamic> e) => RewardsCategoryEntity.fromJson(e)).toList() as M;
     }
+    if (<RewardsDetailEntity>[] is M) {
+      return data.map<RewardsDetailEntity>((Map<String, dynamic> e) => RewardsDetailEntity.fromJson(e)).toList() as M;
+    }
+    if (<RewardsDetailRedeemable>[] is M) {
+      return data.map<RewardsDetailRedeemable>((Map<String, dynamic> e) => RewardsDetailRedeemable.fromJson(e)).toList() as M;
+    }
     if (<RewardsHistoryEarnedEntity>[] is M) {
       return data.map<RewardsHistoryEarnedEntity>((Map<String, dynamic> e) => RewardsHistoryEarnedEntity.fromJson(e)).toList() as M;
     }
+    if (<RewardsHistoryEarnedList>[] is M) {
+      return data.map<RewardsHistoryEarnedList>((Map<String, dynamic> e) => RewardsHistoryEarnedList.fromJson(e)).toList() as M;
+    }
     if (<RewardsHomeEntity>[] is M) {
       return data.map<RewardsHomeEntity>((Map<String, dynamic> e) => RewardsHomeEntity.fromJson(e)).toList() as M;
     }
@@ -440,6 +484,30 @@ class JsonConvert {
     if (<RewardsListList>[] is M) {
       return data.map<RewardsListList>((Map<String, dynamic> e) => RewardsListList.fromJson(e)).toList() as M;
     }
+    if (<RewardsMyDetailEntity>[] is M) {
+      return data.map<RewardsMyDetailEntity>((Map<String, dynamic> e) => RewardsMyDetailEntity.fromJson(e)).toList() as M;
+    }
+    if (<RewardsMyDetailAccount>[] is M) {
+      return data.map<RewardsMyDetailAccount>((Map<String, dynamic> e) => RewardsMyDetailAccount.fromJson(e)).toList() as M;
+    }
+    if (<RewardsMyDetailReward>[] is M) {
+      return data.map<RewardsMyDetailReward>((Map<String, dynamic> e) => RewardsMyDetailReward.fromJson(e)).toList() as M;
+    }
+    if (<RewardsMyEntity>[] is M) {
+      return data.map<RewardsMyEntity>((Map<String, dynamic> e) => RewardsMyEntity.fromJson(e)).toList() as M;
+    }
+    if (<RewardsMyList>[] is M) {
+      return data.map<RewardsMyList>((Map<String, dynamic> e) => RewardsMyList.fromJson(e)).toList() as M;
+    }
+    if (<RewardsMyListReward>[] is M) {
+      return data.map<RewardsMyListReward>((Map<String, dynamic> e) => RewardsMyListReward.fromJson(e)).toList() as M;
+    }
+    if (<RewardsSearchEntity>[] is M) {
+      return data.map<RewardsSearchEntity>((Map<String, dynamic> e) => RewardsSearchEntity.fromJson(e)).toList() as M;
+    }
+    if (<RewardsSearchRewards>[] is M) {
+      return data.map<RewardsSearchRewards>((Map<String, dynamic> e) => RewardsSearchRewards.fromJson(e)).toList() as M;
+    }
     if (<ServerTime>[] is M) {
       return data.map<ServerTime>((Map<String, dynamic> e) => ServerTime.fromJson(e)).toList() as M;
     }
@@ -552,10 +620,12 @@ class JsonConvertClassCollection {
     (NewsfeedNewsEntity).toString(): NewsfeedNewsEntity.fromJson,
     (NewsfeedNewsList).toString(): NewsfeedNewsList.fromJson,
     (NewsfeedNewsListAccount).toString(): NewsfeedNewsListAccount.fromJson,
-    (NoticeBoardAnnounDetailEntity).toString(): NoticeBoardAnnounDetailEntity
-        .fromJson,
+    (NoticeBoardAnnounDetailEntity).toString(): NoticeBoardAnnounDetailEntity.fromJson,
     (NoticeBoardAnnounEntity).toString(): NoticeBoardAnnounEntity.fromJson,
+    (NoticeBoardAnnounList).toString(): NoticeBoardAnnounList.fromJson,
     (NoticeBoardDocumentsEntity).toString(): NoticeBoardDocumentsEntity.fromJson,
+    (NoticeBoardDocumentsList).toString(): NoticeBoardDocumentsList.fromJson,
+    (NoticeBoardEventDetailEntity).toString(): NoticeBoardEventDetailEntity.fromJson,
     (NoticeBoardEventEntity).toString(): NoticeBoardEventEntity.fromJson,
     (NoticeBoardEventList).toString(): NoticeBoardEventList.fromJson,
     (PaymentPageEntity).toString(): PaymentPageEntity.fromJson,
@@ -567,16 +637,16 @@ class JsonConvertClassCollection {
     (PropertySaleRentList).toString(): PropertySaleRentList.fromJson,
     (RewardsActiveDetailEntity).toString(): RewardsActiveDetailEntity.fromJson,
     (RewardsActiveDetailData).toString(): RewardsActiveDetailData.fromJson,
-    (RewardsActiveDetailDataAccount).toString(): RewardsActiveDetailDataAccount
-        .fromJson,
-    (RewardsActiveDetailDataReward).toString(): RewardsActiveDetailDataReward
-        .fromJson,
+    (RewardsActiveDetailDataAccount).toString(): RewardsActiveDetailDataAccount.fromJson,
+    (RewardsActiveDetailDataReward).toString(): RewardsActiveDetailDataReward.fromJson,
     (RewardsBuyEntity).toString(): RewardsBuyEntity.fromJson,
     (RewardsBuyReward).toString(): RewardsBuyReward.fromJson,
-    (RewardsBuyRewardRedeemable).toString(): RewardsBuyRewardRedeemable
-        .fromJson,
+    (RewardsBuyRewardRedeemable).toString(): RewardsBuyRewardRedeemable.fromJson,
     (RewardsCategoryEntity).toString(): RewardsCategoryEntity.fromJson,
+    (RewardsDetailEntity).toString(): RewardsDetailEntity.fromJson,
+    (RewardsDetailRedeemable).toString(): RewardsDetailRedeemable.fromJson,
     (RewardsHistoryEarnedEntity).toString(): RewardsHistoryEarnedEntity.fromJson,
+    (RewardsHistoryEarnedList).toString(): RewardsHistoryEarnedList.fromJson,
     (RewardsHomeEntity).toString(): RewardsHomeEntity.fromJson,
     (RewardsHomeData).toString(): RewardsHomeData.fromJson,
     (RewardsHomeDataRewards).toString(): RewardsHomeDataRewards.fromJson,

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

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

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

@@ -19,11 +19,8 @@ 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;
   }
@@ -57,8 +54,7 @@ extension NoticeBoardAnnounEntityExtension on NoticeBoardAnnounEntity {
   }
 }
 
-NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(Map<String, dynamic> json) {
   final NoticeBoardAnnounList noticeBoardAnnounList = NoticeBoardAnnounList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -75,8 +71,7 @@ NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(
   return noticeBoardAnnounList;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounListToJson(
-    NoticeBoardAnnounList entity) {
+Map<String, dynamic> $NoticeBoardAnnounListToJson(NoticeBoardAnnounList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

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

@@ -19,12 +19,8 @@ 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;
   }
@@ -58,8 +54,7 @@ extension NoticeBoardDocumentsEntityExtension on NoticeBoardDocumentsEntity {
   }
 }
 
-NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(Map<String, dynamic> json) {
   final NoticeBoardDocumentsList noticeBoardDocumentsList = NoticeBoardDocumentsList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -80,8 +75,7 @@ NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(
   return noticeBoardDocumentsList;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsListToJson(
-    NoticeBoardDocumentsList entity) {
+Map<String, dynamic> $NoticeBoardDocumentsListToJson(NoticeBoardDocumentsList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['parent_id'] = entity.parentId;

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

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

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

@@ -19,11 +19,8 @@ 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;
   }

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

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

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

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

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

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

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

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

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

@@ -19,12 +19,8 @@ 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;
   }
@@ -58,8 +54,7 @@ extension RewardsHistoryEarnedEntityExtension on RewardsHistoryEarnedEntity {
   }
 }
 
-RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(
-    Map<String, dynamic> json) {
+RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(Map<String, dynamic> json) {
   final RewardsHistoryEarnedList rewardsHistoryEarnedList = RewardsHistoryEarnedList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -69,8 +64,7 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(
   if (point != null) {
     rewardsHistoryEarnedList.point = point;
   }
-  final String? shortDescription = jsonConvert.convert<String>(
-      json['short_description']);
+  final String? shortDescription = jsonConvert.convert<String>(json['short_description']);
   if (shortDescription != null) {
     rewardsHistoryEarnedList.shortDescription = shortDescription;
   }
@@ -81,8 +75,7 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(
   return rewardsHistoryEarnedList;
 }
 
-Map<String, dynamic> $RewardsHistoryEarnedListToJson(
-    RewardsHistoryEarnedList entity) {
+Map<String, dynamic> $RewardsHistoryEarnedListToJson(RewardsHistoryEarnedList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['point'] = entity.point;

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

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_my_detail_entity.dart';
 
-RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(Map<String, dynamic> json) {
   final RewardsMyDetailEntity rewardsMyDetailEntity = RewardsMyDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -28,21 +27,18 @@ RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(
   if (quantity != null) {
     rewardsMyDetailEntity.quantity = quantity;
   }
-  final RewardsMyDetailAccount? account = jsonConvert.convert<
-      RewardsMyDetailAccount>(json['account']);
-  if (account != null) {
-    rewardsMyDetailEntity.account = account;
-  }
-  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']);
+  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;
@@ -50,8 +46,8 @@ Map<String, dynamic> $RewardsMyDetailEntityToJson(
   data['created_at'] = entity.createdAt;
   data['expired_at'] = entity.expiredAt;
   data['quantity'] = entity.quantity;
-  data['account'] = entity.account.toJson();
   data['reward'] = entity.reward.toJson();
+  data['account'] = entity.account.toJson();
   return data;
 }
 
@@ -63,8 +59,8 @@ extension RewardsMyDetailEntityExtension on RewardsMyDetailEntity {
     String? createdAt,
     String? expiredAt,
     int? quantity,
-    RewardsMyDetailAccount? account,
     RewardsMyDetailReward? reward,
+    RewardsMyDetailAccount? account,
   }) {
     return RewardsMyDetailEntity()
       ..id = id ?? this.id
@@ -73,13 +69,12 @@ extension RewardsMyDetailEntityExtension on RewardsMyDetailEntity {
       ..createdAt = createdAt ?? this.createdAt
       ..expiredAt = expiredAt ?? this.expiredAt
       ..quantity = quantity ?? this.quantity
-      ..account = account ?? this.account
-      ..reward = reward ?? this.reward;
+      ..reward = reward ?? this.reward
+      ..account = account ?? this.account;
   }
 }
 
-RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(
-    Map<String, dynamic> json) {
+RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(Map<String, dynamic> json) {
   final RewardsMyDetailAccount rewardsMyDetailAccount = RewardsMyDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -96,8 +91,7 @@ RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(
   return rewardsMyDetailAccount;
 }
 
-Map<String, dynamic> $RewardsMyDetailAccountToJson(
-    RewardsMyDetailAccount entity) {
+Map<String, dynamic> $RewardsMyDetailAccountToJson(RewardsMyDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -118,8 +112,7 @@ extension RewardsMyDetailAccountExtension on RewardsMyDetailAccount {
   }
 }
 
-RewardsMyDetailReward $RewardsMyDetailRewardFromJson(
-    Map<String, dynamic> json) {
+RewardsMyDetailReward $RewardsMyDetailRewardFromJson(Map<String, dynamic> json) {
   final RewardsMyDetailReward rewardsMyDetailReward = RewardsMyDetailReward();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -142,8 +135,7 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(
   if (point != null) {
     rewardsMyDetailReward.point = point;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(
-      json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsMyDetailReward.redeemedStart = redeemedStart;
   }
@@ -154,8 +146,7 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(
   return rewardsMyDetailReward;
 }
 
-Map<String, dynamic> $RewardsMyDetailRewardToJson(
-    RewardsMyDetailReward entity) {
+Map<String, dynamic> $RewardsMyDetailRewardToJson(RewardsMyDetailReward entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

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

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

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

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

packages/cs_resources/lib/l10n/intl_en.arb

@@ -1,6 +1,6 @@
 {
-  "payment1": "Payment",
-  "rewards1": "Rewards",
+  "payment": "Payment",
+  "rewards": "Rewards",
   "notification": "Notification",
   "facility": "Facility",
   "form": "Form",