合并代码-解决数据实体模块的冲突

！~ 遇到Domain模块的冲突，同意对方的改动即可，然后进入Domain目录项目重新生成再上传git即可

packages/cpt_main/lib/modules/me/me_page.dart

@@ -24,10 +24,6 @@ class MePage extends HookConsumerWidget {
     final viewModel = ref.watch(meViewModelProvider.notifier);
     final userConfig = UserConfigService.getState(ref: ref);
 
-    String totalAccountsCount = userConfig.user?.estates?.fold(0, (sum, estate) {
-      return sum + (estate.accounts?.length ?? 0);
-    }).toString() ?? "0";
-
     return Scaffold(
       appBar: MyAppBar.appBar(
         context,

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

@@ -6,6 +6,7 @@
 import 'package:flutter/material.dart' show debugPrint;
 import 'package:domain/entity/auth_login_entity.dart';
 import 'package:domain/entity/captcha_img_entity.dart';
+import 'package:domain/entity/id_name_entity.dart';
 import 'package:domain/entity/property_news_entity.dart';
 import 'package:domain/entity/property_sale_entity.dart';
 import 'package:domain/entity/server_time.dart';
@@ -67,14 +68,12 @@ class JsonConvert {
     }
   }
 
-  List<T?>? convertList<T>(List<dynamic>? value,
-      {EnumConvertFunction? enumConvert}) {
+  List<T?>? convertList<T>(List<dynamic>? value, {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert))
-          .toList();
+      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)).toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -84,14 +83,12 @@ class JsonConvert {
     }
   }
 
-  List<T>? convertListNotNull<T>(dynamic value,
-      {EnumConvertFunction? enumConvert}) {
+  List<T>? convertListNotNull<T>(dynamic value, {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return (value as List<dynamic>).map((dynamic e) =>
-      _asT<T>(e, enumConvert: enumConvert)!).toList();
+      return (value as List<dynamic>).map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)!).toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -139,8 +136,7 @@ class JsonConvert {
           return covertFunc(Map<String, dynamic>.from(value)) as T;
         }
       } else {
-        throw UnimplementedError(
-            '$type unimplemented,you can try running the app again');
+        throw UnimplementedError('$type unimplemented,you can try running the app again');
       }
     }
   }
@@ -148,48 +144,43 @@ class JsonConvert {
   //list is returned by type
   static M? _getListChildType<M>(List<Map<String, dynamic>> data) {
     if (<AuthLoginEntity>[] is M) {
-      return data.map<AuthLoginEntity>((Map<String, dynamic> e) =>
-          AuthLoginEntity.fromJson(e)).toList() as M;
+      return data.map<AuthLoginEntity>((Map<String, dynamic> e) => AuthLoginEntity.fromJson(e)).toList() as M;
     }
     if (<CaptchaImgEntity>[] is M) {
-      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) =>
-          CaptchaImgEntity.fromJson(e)).toList() as M;
+      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) => CaptchaImgEntity.fromJson(e)).toList() as M;
+    }
+    if (<IdNameEntity>[] is M) {
+      return data.map<IdNameEntity>((Map<String, dynamic> e) => IdNameEntity.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsEntity>[] is M) {
-      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) =>
-          PropertyNewsEntity.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) => PropertyNewsEntity.fromJson(e)).toList() as M;
     }
     if (<PropertySaleEntity>[] is M) {
-      return data.map<PropertySaleEntity>((Map<String, dynamic> e) =>
-          PropertySaleEntity.fromJson(e)).toList() as M;
+      return data.map<PropertySaleEntity>((Map<String, dynamic> e) => PropertySaleEntity.fromJson(e)).toList() as M;
     }
     if (<ServerTime>[] is M) {
-      return data.map<ServerTime>((Map<String, dynamic> e) =>
-          ServerTime.fromJson(e)).toList() as M;
+      return data.map<ServerTime>((Map<String, dynamic> e) => ServerTime.fromJson(e)).toList() as M;
     }
     if (<UserMeEntity>[] is M) {
-      return data.map<UserMeEntity>((Map<String, dynamic> e) =>
-          UserMeEntity.fromJson(e)).toList() as M;
+      return data.map<UserMeEntity>((Map<String, dynamic> e) => UserMeEntity.fromJson(e)).toList() as M;
     }
     if (<UserMeHouseholds>[] is M) {
-      return data.map<UserMeHouseholds>((Map<String, dynamic> e) =>
-          UserMeHouseholds.fromJson(e)).toList() as M;
+      return data.map<UserMeHouseholds>((Map<String, dynamic> e) => UserMeHouseholds.fromJson(e)).toList() as M;
     }
     if (<UserMeEstates>[] is M) {
-      return data.map<UserMeEstates>((Map<String, dynamic> e) =>
-          UserMeEstates.fromJson(e)).toList() as M;
+      return data.map<UserMeEstates>((Map<String, dynamic> e) => UserMeEstates.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccounts>[] is M) {
-      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) =>
-          UserMeEstatesAccounts.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) => UserMeEstatesAccounts.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccountsUnit>[] is M) {
-      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) =>
-          UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) => UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
     }
     if (<UserMeDefaultUnit>[] is M) {
-      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) =>
-          UserMeDefaultUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) => UserMeDefaultUnit.fromJson(e)).toList() as M;
+    }
+    if (<UserMeInformation>[] is M) {
+      return data.map<UserMeInformation>((Map<String, dynamic> e) => UserMeInformation.fromJson(e)).toList() as M;
     }
 
     debugPrint("$M not found");
@@ -202,8 +193,7 @@ class JsonConvert {
       return json;
     }
     if (json is List) {
-      return _getListChildType<M>(
-          json.map((dynamic e) => e as Map<String, dynamic>).toList());
+      return _getListChildType<M>(json.map((dynamic e) => e as Map<String, dynamic>).toList());
     } else {
       return jsonConvert.convert<M>(json);
     }
@@ -214,6 +204,7 @@ class JsonConvertClassCollection {
   Map<String, JsonConvertFunction> convertFuncMap = {
     (AuthLoginEntity).toString(): AuthLoginEntity.fromJson,
     (CaptchaImgEntity).toString(): CaptchaImgEntity.fromJson,
+    (IdNameEntity).toString(): IdNameEntity.fromJson,
     (PropertyNewsEntity).toString(): PropertyNewsEntity.fromJson,
     (PropertySaleEntity).toString(): PropertySaleEntity.fromJson,
     (ServerTime).toString(): ServerTime.fromJson,
@@ -223,6 +214,7 @@ class JsonConvertClassCollection {
     (UserMeEstatesAccounts).toString(): UserMeEstatesAccounts.fromJson,
     (UserMeEstatesAccountsUnit).toString(): UserMeEstatesAccountsUnit.fromJson,
     (UserMeDefaultUnit).toString(): UserMeDefaultUnit.fromJson,
+    (UserMeInformation).toString(): UserMeInformation.fromJson,
   };
 
   bool containsKey(String type) {

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

@@ -19,13 +19,15 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (phone != null) {
     userMeEntity.phone = phone;
   }
-  final String? followsCount = jsonConvert.convert<String>(
-      json['follows_count']);
+  final String? email = jsonConvert.convert<String>(json['email']);
+  if (email != null) {
+    userMeEntity.email = email;
+  }
+  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;
   }
@@ -33,26 +35,24 @@ 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']);
+  if (information != null) {
+    userMeEntity.information = information;
+  }
   return userMeEntity;
 }
 
@@ -62,12 +62,14 @@ Map<String, dynamic> $UserMeEntityToJson(UserMeEntity entity) {
   data['name'] = entity.name;
   data['avatar'] = entity.avatar;
   data['phone'] = entity.phone;
+  data['email'] = entity.email;
   data['follows_count'] = entity.followsCount;
   data['flowers_count'] = entity.flowersCount;
   data['posts_count'] = entity.postsCount;
   data['households'] = entity.households?.map((v) => v.toJson()).toList();
   data['estates'] = entity.estates?.map((v) => v.toJson()).toList();
   data['default_unit'] = entity.defaultUnit?.toJson();
+  data['information'] = entity.information?.toJson();
   return data;
 }
 
@@ -77,24 +79,28 @@ extension UserMeEntityExtension on UserMeEntity {
     String? name,
     String? avatar,
     String? phone,
+    String? email,
     String? followsCount,
     String? flowersCount,
     String? postsCount,
     List<UserMeHouseholds>? households,
     List<UserMeEstates>? estates,
     UserMeDefaultUnit? defaultUnit,
+    UserMeInformation? information,
   }) {
     return UserMeEntity()
       ..id = id ?? this.id
       ..name = name ?? this.name
       ..avatar = avatar ?? this.avatar
       ..phone = phone ?? this.phone
+      ..email = email ?? this.email
       ..followsCount = followsCount ?? this.followsCount
       ..flowersCount = flowersCount ?? this.flowersCount
       ..postsCount = postsCount ?? this.postsCount
       ..households = households ?? this.households
       ..estates = estates ?? this.estates
-      ..defaultUnit = defaultUnit ?? this.defaultUnit;
+      ..defaultUnit = defaultUnit ?? this.defaultUnit
+      ..information = information ?? this.information;
   }
 }
 
@@ -146,12 +152,8 @@ UserMeEstates $UserMeEstatesFromJson(Map<String, dynamic> json) {
   if (name != null) {
     userMeEstates.name = name;
   }
-  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts)
-      .toList();
+  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts).toList();
   if (accounts != null) {
     userMeEstates.accounts = accounts;
   }
@@ -179,8 +181,7 @@ extension UserMeEstatesExtension on UserMeEstates {
   }
 }
 
-UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccounts userMeEstatesAccounts = UserMeEstatesAccounts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -202,20 +203,18 @@ UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
   if (isDefault != null) {
     userMeEstatesAccounts.isDefault = isDefault;
   }
-  final dynamic status = json['status'];
+  final String? status = jsonConvert.convert<String>(json['status']);
   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;
@@ -234,7 +233,7 @@ extension UserMeEstatesAccountsExtension on UserMeEstatesAccounts {
     String? avatar,
     String? type,
     int? isDefault,
-    dynamic status,
+    String? status,
     UserMeEstatesAccountsUnit? unit,
   }) {
     return UserMeEstatesAccounts()
@@ -248,8 +247,7 @@ extension UserMeEstatesAccountsExtension on UserMeEstatesAccounts {
   }
 }
 
-UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccountsUnit userMeEstatesAccountsUnit = UserMeEstatesAccountsUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -274,8 +272,7 @@ UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
   return userMeEstatesAccountsUnit;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(
-    UserMeEstatesAccountsUnit entity) {
+Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(UserMeEstatesAccountsUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['block'] = entity.block;
@@ -366,4 +363,49 @@ extension UserMeDefaultUnitExtension on UserMeDefaultUnit {
       ..address = address ?? this.address
       ..type = type ?? this.type;
   }
+}
+
+UserMeInformation $UserMeInformationFromJson(Map<String, dynamic> json) {
+  final UserMeInformation userMeInformation = UserMeInformation();
+  final String? firstName = jsonConvert.convert<String>(json['first_name']);
+  if (firstName != null) {
+    userMeInformation.firstName = firstName;
+  }
+  final String? lastName = jsonConvert.convert<String>(json['last_name']);
+  if (lastName != null) {
+    userMeInformation.lastName = lastName;
+  }
+  final String? countryCode = jsonConvert.convert<String>(json['country_code']);
+  if (countryCode != null) {
+    userMeInformation.countryCode = countryCode;
+  }
+  final String? phone = jsonConvert.convert<String>(json['phone']);
+  if (phone != null) {
+    userMeInformation.phone = phone;
+  }
+  return userMeInformation;
+}
+
+Map<String, dynamic> $UserMeInformationToJson(UserMeInformation entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['first_name'] = entity.firstName;
+  data['last_name'] = entity.lastName;
+  data['country_code'] = entity.countryCode;
+  data['phone'] = entity.phone;
+  return data;
+}
+
+extension UserMeInformationExtension on UserMeInformation {
+  UserMeInformation copyWith({
+    String? firstName,
+    String? lastName,
+    String? countryCode,
+    String? phone,
+  }) {
+    return UserMeInformation()
+      ..firstName = firstName ?? this.firstName
+      ..lastName = lastName ?? this.lastName
+      ..countryCode = countryCode ?? this.countryCode
+      ..phone = phone ?? this.phone;
+  }
 }

packages/cs_plugin_basic/lib/provider/user_config/user_config.dart

@@ -8,6 +8,7 @@ class UserConfig {
   //用户的登录Token
   String? token;
 
+  //用户姓名
   String? userName;
 
   //用户是否已经登录
@@ -25,7 +26,6 @@ class UserConfig {
   UserConfig({
     this.user,
     this.token,
-
     this.userName,
     required this.hasLogin,
     this.registrationId,