diff --git a/lib/account/models/bank_entity.dart b/lib/account/models/bank_entity.dart
index 0bb9e4b46..a537199e7 100644
--- a/lib/account/models/bank_entity.dart
+++ b/lib/account/models/bank_entity.dart
@@ -1,11 +1,16 @@
-
 import 'package:azlistview/azlistview.dart';
-import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/generated/json/bank_entity.g.dart';
+import 'package:flutter_deer/generated/json/base/json_field.dart';
 
-class BankEntity with JsonConvert<BankEntity>, ISuspensionBean {
+@JsonSerializable()
+class BankEntity with ISuspensionBean {
 
 	BankEntity({this.id, this.bankName, this.firstLetter});
 
+	factory BankEntity.fromJson(Map<String, dynamic> json) => $BankEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $BankEntityToJson(this);
+
 	int? id;
 	String? bankName;
 	String? firstLetter;
diff --git a/lib/account/models/city_entity.dart b/lib/account/models/city_entity.dart
index 8972f6be7..5f89e5989 100644
--- a/lib/account/models/city_entity.dart
+++ b/lib/account/models/city_entity.dart
@@ -1,8 +1,16 @@
-
 import 'package:azlistview/azlistview.dart';
-import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/generated/json/base/json_field.dart';
+import 'package:flutter_deer/generated/json/city_entity.g.dart';
+
+@JsonSerializable()
+class CityEntity with ISuspensionBean {
+
+	CityEntity();
+
+	factory CityEntity.fromJson(Map<String, dynamic> json) => $CityEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $CityEntityToJson(this);
 
-class CityEntity with JsonConvert<CityEntity>, ISuspensionBean {
 	late String name;
 	late String cityCode;
 	late String firstCharacter;
diff --git a/lib/account/page/bank_select_page.dart b/lib/account/page/bank_select_page.dart
index 0907fa814..ccd5b43eb 100644
--- a/lib/account/page/bank_select_page.dart
+++ b/lib/account/page/bank_select_page.dart
@@ -70,7 +70,7 @@ class _BankSelectPageState extends State<BankSelectPage> {
   }
 
   void _addBank(dynamic value) {
-    _bankList.add(BankEntity().fromJson(value as Map<String, dynamic>));
+    _bankList.add(BankEntity.fromJson(value as Map<String, dynamic>));
   }
   
   @override
diff --git a/lib/account/page/city_select_page.dart b/lib/account/page/city_select_page.dart
index f824268c3..c0fc752d5 100644
--- a/lib/account/page/city_select_page.dart
+++ b/lib/account/page/city_select_page.dart
@@ -55,7 +55,7 @@ class _CitySelectPageState extends State<CitySelectPage> {
   }
 
   void _addCity(dynamic value) {
-    _cityList.add(CityEntity().fromJson(value as Map<String, dynamic>));
+    _cityList.add(CityEntity.fromJson(value as Map<String, dynamic>));
   }
 
   /// rootBundle.loadString源码修改
diff --git a/lib/generated/json/bank_entity.g.dart b/lib/generated/json/bank_entity.g.dart
new file mode 100644
index 000000000..573b6e9c5
--- /dev/null
+++ b/lib/generated/json/bank_entity.g.dart
@@ -0,0 +1,29 @@
+import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/account/models/bank_entity.dart';
+import 'package:azlistview/azlistview.dart';
+
+
+BankEntity $BankEntityFromJson(Map<String, dynamic> json) {
+	final BankEntity bankEntity = BankEntity();
+	final int? id = jsonConvert.convert<int>(json['id']);
+	if (id != null) {
+		bankEntity.id = id;
+	}
+	final String? bankName = jsonConvert.convert<String>(json['bankName']);
+	if (bankName != null) {
+		bankEntity.bankName = bankName;
+	}
+	final String? firstLetter = jsonConvert.convert<String>(json['firstLetter']);
+	if (firstLetter != null) {
+		bankEntity.firstLetter = firstLetter;
+	}
+	return bankEntity;
+}
+
+Map<String, dynamic> $BankEntityToJson(BankEntity entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['id'] = entity.id;
+	data['bankName'] = entity.bankName;
+	data['firstLetter'] = entity.firstLetter;
+	return data;
+}
\ No newline at end of file
diff --git a/lib/generated/json/bank_entity_helper.dart b/lib/generated/json/bank_entity_helper.dart
deleted file mode 100644
index 2bde612ac..000000000
--- a/lib/generated/json/bank_entity_helper.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:flutter_deer/account/models/bank_entity.dart';
-
-bankEntityFromJson(BankEntity data, Map<String, dynamic> json) {
-	if (json['id'] != null) {
-		data.id = json['id'] is String
-				? int.tryParse(json['id'])
-				: json['id'].toInt();
-	}
-	if (json['bankName'] != null) {
-		data.bankName = json['bankName'].toString();
-	}
-	if (json['firstLetter'] != null) {
-		data.firstLetter = json['firstLetter'].toString();
-	}
-	return data;
-}
-
-Map<String, dynamic> bankEntityToJson(BankEntity entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['id'] = entity.id;
-	data['bankName'] = entity.bankName;
-	data['firstLetter'] = entity.firstLetter;
-	return data;
-}
\ No newline at end of file
diff --git a/lib/generated/json/base/json_convert_content.dart b/lib/generated/json/base/json_convert_content.dart
index da968a93b..4ddbc5eff 100644
--- a/lib/generated/json/base/json_convert_content.dart
+++ b/lib/generated/json/base/json_convert_content.dart
@@ -4,117 +4,155 @@
 
 // This file is automatically generated. DO NOT EDIT, all your changes would be lost.
 import 'package:flutter_deer/account/models/bank_entity.dart';
-import 'package:flutter_deer/generated/json/bank_entity_helper.dart';
-import 'package:flutter_deer/shop/models/user_entity.dart';
-import 'package:flutter_deer/generated/json/user_entity_helper.dart';
+import 'package:flutter_deer/generated/json/bank_entity.g.dart';
 import 'package:flutter_deer/account/models/city_entity.dart';
-import 'package:flutter_deer/generated/json/city_entity_helper.dart';
+import 'package:flutter_deer/generated/json/city_entity.g.dart';
 import 'package:flutter_deer/goods/models/goods_sort_entity.dart';
-import 'package:flutter_deer/generated/json/goods_sort_entity_helper.dart';
+import 'package:flutter_deer/generated/json/goods_sort_entity.g.dart';
 import 'package:flutter_deer/order/models/search_entity.dart';
-import 'package:flutter_deer/generated/json/search_entity_helper.dart';
+import 'package:flutter_deer/generated/json/search_entity.g.dart';
+import 'package:flutter_deer/shop/models/user_entity.dart';
+import 'package:flutter_deer/generated/json/user_entity.g.dart';
 
-class JsonConvert<T> {
-	T fromJson(Map<String, dynamic> json) {
-		return _getFromJson<T>(runtimeType, this, json);
-	}
+JsonConvert jsonConvert = JsonConvert();
 
-  Map<String, dynamic> toJson() {
-		return _getToJson<T>(runtimeType, this);
+class JsonConvert {
+
+  T? convert<T>(dynamic value) {
+    if (value == null) {
+      return null;
+    }
+    return asT<T>(value);
   }
 
-  static _getFromJson<T>(Type type, data, json) {
-    switch (type) {
-			case BankEntity:
-				return bankEntityFromJson(data as BankEntity, json) as T;
-			case UserEntity:
-				return userEntityFromJson(data as UserEntity, json) as T;
-			case CityEntity:
-				return cityEntityFromJson(data as CityEntity, json) as T;
-			case GoodsSortEntity:
-				return goodsSortEntityFromJson(data as GoodsSortEntity, json) as T;
-			case SearchEntity:
-				return searchEntityFromJson(data as SearchEntity, json) as T;
-			case SearchItems:
-				return searchItemsFromJson(data as SearchItems, json) as T;
-			case SearchItemsOwner:
-				return searchItemsOwnerFromJson(data as SearchItemsOwner, json) as T;
-			case SearchItemsLicense:
-				return searchItemsLicenseFromJson(data as SearchItemsLicense, json) as T;    }
-    return data as T;
+  List<T?>? convertList<T>(List<dynamic>? value) {
+    if (value == null) {
+      return null;
+    }
+    try {
+      return value.map((dynamic e) => asT<T>(e)).toList();
+    } catch (e, stackTrace) {
+      print('asT<$T> $e $stackTrace');
+      return <T>[];
+    }
   }
 
-  static _getToJson<T>(Type type, data) {
-		switch (type) {
-			case BankEntity:
-				return bankEntityToJson(data as BankEntity);
-			case UserEntity:
-				return userEntityToJson(data as UserEntity);
-			case CityEntity:
-				return cityEntityToJson(data as CityEntity);
-			case GoodsSortEntity:
-				return goodsSortEntityToJson(data as GoodsSortEntity);
-			case SearchEntity:
-				return searchEntityToJson(data as SearchEntity);
-			case SearchItems:
-				return searchItemsToJson(data as SearchItems);
-			case SearchItemsOwner:
-				return searchItemsOwnerToJson(data as SearchItemsOwner);
-			case SearchItemsLicense:
-				return searchItemsLicenseToJson(data as SearchItemsLicense);
-			}
-			return data as T;
-		}
-  //Go back to a single instance by type
-	static _fromJsonSingle<M>( json) {
-		String type = M.toString();
+  List<T>? convertListNotNull<T>(dynamic value) {
+    if (value == null) {
+      return null;
+    }
+    try {
+      return (value as List<dynamic>).map((dynamic e) => asT<T>(e)!).toList();
+    } catch (e, stackTrace) {
+      print('asT<$T> $e $stackTrace');
+      return <T>[];
+    }
+  }
+  T? asT<T extends Object?>(dynamic value) {
+    if (value is T) {
+      return value;
+    }
+		final String type = T.toString();
+    try {
+      final String valueS = value.toString();
+      if (type == "String") {
+        return valueS as T;
+      } else if (type == "int") {
+        final int? intValue = int.tryParse(valueS);
+        if (intValue == null) {
+          return double.tryParse(valueS)?.toInt() as T?;
+        } else {
+          return intValue as T;
+        }      } else if (type == "double") {
+        return double.parse(valueS) as T;
+      } else if (type ==  "DateTime") {
+        return DateTime.parse(valueS) as T;
+      } else if (type ==  "bool") {
+        if (valueS == '0' || valueS == '1') {
+          return (valueS == '1') as T;
+        }
+        return (valueS == 'true') as T;
+      } else {
+        return JsonConvert.fromJsonAsT<T>(value);
+      }
+    } catch (e, stackTrace) {
+      print('asT<$T> $e $stackTrace');
+      return null;
+    }
+  } 
+	//Go back to a single instance by type
+	static M? _fromJsonSingle<M>(Map<String, dynamic> json) {
+		final String type = M.toString();
 		if(type == (BankEntity).toString()){
-			return BankEntity().fromJson(json);
-		}	else if(type == (UserEntity).toString()){
-			return UserEntity().fromJson(json);
-		}	else if(type == (CityEntity).toString()){
-			return CityEntity().fromJson(json);
-		}	else if(type == (GoodsSortEntity).toString()){
-			return GoodsSortEntity().fromJson(json);
-		}	else if(type == (SearchEntity).toString()){
-			return SearchEntity().fromJson(json);
-		}	else if(type == (SearchItems).toString()){
-			return SearchItems().fromJson(json);
-		}	else if(type == (SearchItemsOwner).toString()){
-			return SearchItemsOwner().fromJson(json);
-		}	else if(type == (SearchItemsLicense).toString()){
-			return SearchItemsLicense().fromJson(json);
-		}	
+			return BankEntity.fromJson(json) as M;
+		}
+		if(type == (CityEntity).toString()){
+			return CityEntity.fromJson(json) as M;
+		}
+		if(type == (GoodsSortEntity).toString()){
+			return GoodsSortEntity.fromJson(json) as M;
+		}
+		if(type == (SearchEntity).toString()){
+			return SearchEntity.fromJson(json) as M;
+		}
+		if(type == (SearchItems).toString()){
+			return SearchItems.fromJson(json) as M;
+		}
+		if(type == (SearchItemsOwner).toString()){
+			return SearchItemsOwner.fromJson(json) as M;
+		}
+		if(type == (SearchItemsLicense).toString()){
+			return SearchItemsLicense.fromJson(json) as M;
+		}
+		if(type == (UserEntity).toString()){
+			return UserEntity.fromJson(json) as M;
+		}
+
+		print("$type not found");
+	
 		return null;
-	}
+}
 
   //list is returned by type
-	static M _getListChildType<M>(List data) {
+	static M? _getListChildType<M>(List<dynamic> data) {
 		if(<BankEntity>[] is M){
-			return data.map<BankEntity>((e) => BankEntity().fromJson(e)).toList() as M;
-		}	else if(<UserEntity>[] is M){
-			return data.map<UserEntity>((e) => UserEntity().fromJson(e)).toList() as M;
-		}	else if(<CityEntity>[] is M){
-			return data.map<CityEntity>((e) => CityEntity().fromJson(e)).toList() as M;
-		}	else if(<GoodsSortEntity>[] is M){
-			return data.map<GoodsSortEntity>((e) => GoodsSortEntity().fromJson(e)).toList() as M;
-		}	else if(<SearchEntity>[] is M){
-			return data.map<SearchEntity>((e) => SearchEntity().fromJson(e)).toList() as M;
-		}	else if(<SearchItems>[] is M){
-			return data.map<SearchItems>((e) => SearchItems().fromJson(e)).toList() as M;
-		}	else if(<SearchItemsOwner>[] is M){
-			return data.map<SearchItemsOwner>((e) => SearchItemsOwner().fromJson(e)).toList() as M;
-		}	else if(<SearchItemsLicense>[] is M){
-			return data.map<SearchItemsLicense>((e) => SearchItemsLicense().fromJson(e)).toList() as M;
-		}
-		throw Exception("not fond");
-	}
+			return data.map<BankEntity>((e) => BankEntity.fromJson(e)).toList() as M;
+		}
+		if(<CityEntity>[] is M){
+			return data.map<CityEntity>((e) => CityEntity.fromJson(e)).toList() as M;
+		}
+		if(<GoodsSortEntity>[] is M){
+			return data.map<GoodsSortEntity>((e) => GoodsSortEntity.fromJson(e)).toList() as M;
+		}
+		if(<SearchEntity>[] is M){
+			return data.map<SearchEntity>((e) => SearchEntity.fromJson(e)).toList() as M;
+		}
+		if(<SearchItems>[] is M){
+			return data.map<SearchItems>((e) => SearchItems.fromJson(e)).toList() as M;
+		}
+		if(<SearchItemsOwner>[] is M){
+			return data.map<SearchItemsOwner>((e) => SearchItemsOwner.fromJson(e)).toList() as M;
+		}
+		if(<SearchItemsLicense>[] is M){
+			return data.map<SearchItemsLicense>((e) => SearchItemsLicense.fromJson(e)).toList() as M;
+		}
+		if(<UserEntity>[] is M){
+			return data.map<UserEntity>((e) => UserEntity.fromJson(e)).toList() as M;
+		}
 
-  static M fromJsonAsT<M>(json) {
-    if (json is List) {
-      return _getListChildType<M>(json);
-    } else {
-      return _fromJsonSingle<M>(json) as M;
-    }
-  }
+		print("${M.toString()} not found");
+	
+		return null;
+}
+
+  static M? fromJsonAsT<M>(dynamic json) {
+		if(json == null){
+			return null;
+		}
+		if (json is List) {
+			return _getListChildType<M>(json);
+		} else {
+			return _fromJsonSingle<M>(json as Map<String, dynamic>);
+		}
+	}
 }
\ No newline at end of file
diff --git a/lib/generated/json/base/json_field.dart b/lib/generated/json/base/json_field.dart
index 33e90c042..260ab1421 100644
--- a/lib/generated/json/base/json_field.dart
+++ b/lib/generated/json/base/json_field.dart
@@ -4,6 +4,10 @@
 
 // This file is automatically generated. DO NOT EDIT, all your changes would be lost.
 
+class JsonSerializable{
+    const JsonSerializable();
+}
+
 class JSONField {
   //Specify the parse field name
   final String? name;
diff --git a/lib/generated/json/city_entity.g.dart b/lib/generated/json/city_entity.g.dart
new file mode 100644
index 000000000..b2b1f3530
--- /dev/null
+++ b/lib/generated/json/city_entity.g.dart
@@ -0,0 +1,29 @@
+import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/account/models/city_entity.dart';
+import 'package:azlistview/azlistview.dart';
+
+
+CityEntity $CityEntityFromJson(Map<String, dynamic> json) {
+	final CityEntity cityEntity = CityEntity();
+	final String? name = jsonConvert.convert<String>(json['name']);
+	if (name != null) {
+		cityEntity.name = name;
+	}
+	final String? cityCode = jsonConvert.convert<String>(json['cityCode']);
+	if (cityCode != null) {
+		cityEntity.cityCode = cityCode;
+	}
+	final String? firstCharacter = jsonConvert.convert<String>(json['firstCharacter']);
+	if (firstCharacter != null) {
+		cityEntity.firstCharacter = firstCharacter;
+	}
+	return cityEntity;
+}
+
+Map<String, dynamic> $CityEntityToJson(CityEntity entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['name'] = entity.name;
+	data['cityCode'] = entity.cityCode;
+	data['firstCharacter'] = entity.firstCharacter;
+	return data;
+}
\ No newline at end of file
diff --git a/lib/generated/json/city_entity_helper.dart b/lib/generated/json/city_entity_helper.dart
deleted file mode 100644
index 30be591b8..000000000
--- a/lib/generated/json/city_entity_helper.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-import 'package:flutter_deer/account/models/city_entity.dart';
-
-cityEntityFromJson(CityEntity data, Map<String, dynamic> json) {
-	if (json['name'] != null) {
-		data.name = json['name'].toString();
-	}
-	if (json['cityCode'] != null) {
-		data.cityCode = json['cityCode'].toString();
-	}
-	if (json['firstCharacter'] != null) {
-		data.firstCharacter = json['firstCharacter'].toString();
-	}
-	return data;
-}
-
-Map<String, dynamic> cityEntityToJson(CityEntity entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['name'] = entity.name;
-	data['cityCode'] = entity.cityCode;
-	data['firstCharacter'] = entity.firstCharacter;
-	return data;
-}
\ No newline at end of file
diff --git a/lib/generated/json/goods_sort_entity.g.dart b/lib/generated/json/goods_sort_entity.g.dart
new file mode 100644
index 000000000..983ca7d11
--- /dev/null
+++ b/lib/generated/json/goods_sort_entity.g.dart
@@ -0,0 +1,22 @@
+import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/goods/models/goods_sort_entity.dart';
+
+GoodsSortEntity $GoodsSortEntityFromJson(Map<String, dynamic> json) {
+	final GoodsSortEntity goodsSortEntity = GoodsSortEntity();
+	final String? id = jsonConvert.convert<String>(json['id']);
+	if (id != null) {
+		goodsSortEntity.id = id;
+	}
+	final String? name = jsonConvert.convert<String>(json['name']);
+	if (name != null) {
+		goodsSortEntity.name = name;
+	}
+	return goodsSortEntity;
+}
+
+Map<String, dynamic> $GoodsSortEntityToJson(GoodsSortEntity entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['id'] = entity.id;
+	data['name'] = entity.name;
+	return data;
+}
\ No newline at end of file
diff --git a/lib/generated/json/goods_sort_entity_helper.dart b/lib/generated/json/goods_sort_entity_helper.dart
deleted file mode 100644
index 3e93d623b..000000000
--- a/lib/generated/json/goods_sort_entity_helper.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'package:flutter_deer/goods/models/goods_sort_entity.dart';
-
-goodsSortEntityFromJson(GoodsSortEntity data, Map<String, dynamic> json) {
-	if (json['id'] != null) {
-		data.id = json['id'].toString();
-	}
-	if (json['name'] != null) {
-		data.name = json['name'].toString();
-	}
-	return data;
-}
-
-Map<String, dynamic> goodsSortEntityToJson(GoodsSortEntity entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['id'] = entity.id;
-	data['name'] = entity.name;
-	return data;
-}
\ No newline at end of file
diff --git a/lib/generated/json/search_entity.g.dart b/lib/generated/json/search_entity.g.dart
new file mode 100644
index 000000000..510ea2259
--- /dev/null
+++ b/lib/generated/json/search_entity.g.dart
@@ -0,0 +1,537 @@
+import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/order/models/search_entity.dart';
+
+SearchEntity $SearchEntityFromJson(Map<String, dynamic> json) {
+	final SearchEntity searchEntity = SearchEntity();
+	final int? totalCount = jsonConvert.convert<int>(json['total_count']);
+	if (totalCount != null) {
+		searchEntity.totalCount = totalCount;
+	}
+	final bool? incompleteResults = jsonConvert.convert<bool>(json['incomplete_results']);
+	if (incompleteResults != null) {
+		searchEntity.incompleteResults = incompleteResults;
+	}
+	final List<SearchItems>? items = jsonConvert.convertListNotNull<SearchItems>(json['items']);
+	if (items != null) {
+		searchEntity.items = items;
+	}
+	return searchEntity;
+}
+
+Map<String, dynamic> $SearchEntityToJson(SearchEntity entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['total_count'] = entity.totalCount;
+	data['incomplete_results'] = entity.incompleteResults;
+	data['items'] =  entity.items?.map((v) => v.toJson()).toList();
+	return data;
+}
+
+SearchItems $SearchItemsFromJson(Map<String, dynamic> json) {
+	final SearchItems searchItems = SearchItems();
+	final int? id = jsonConvert.convert<int>(json['id']);
+	if (id != null) {
+		searchItems.id = id;
+	}
+	final String? nodeId = jsonConvert.convert<String>(json['node_id']);
+	if (nodeId != null) {
+		searchItems.nodeId = nodeId;
+	}
+	final String? name = jsonConvert.convert<String>(json['name']);
+	if (name != null) {
+		searchItems.name = name;
+	}
+	final String? fullName = jsonConvert.convert<String>(json['full_name']);
+	if (fullName != null) {
+		searchItems.fullName = fullName;
+	}
+	final bool? private = jsonConvert.convert<bool>(json['private']);
+	if (private != null) {
+		searchItems.private = private;
+	}
+	final SearchItemsOwner? owner = jsonConvert.convert<SearchItemsOwner>(json['owner']);
+	if (owner != null) {
+		searchItems.owner = owner;
+	}
+	final String? htmlUrl = jsonConvert.convert<String>(json['html_url']);
+	if (htmlUrl != null) {
+		searchItems.htmlUrl = htmlUrl;
+	}
+	final String? description = jsonConvert.convert<String>(json['description']);
+	if (description != null) {
+		searchItems.description = description;
+	}
+	final bool? fork = jsonConvert.convert<bool>(json['fork']);
+	if (fork != null) {
+		searchItems.fork = fork;
+	}
+	final String? url = jsonConvert.convert<String>(json['url']);
+	if (url != null) {
+		searchItems.url = url;
+	}
+	final String? forksUrl = jsonConvert.convert<String>(json['forks_url']);
+	if (forksUrl != null) {
+		searchItems.forksUrl = forksUrl;
+	}
+	final String? keysUrl = jsonConvert.convert<String>(json['keys_url']);
+	if (keysUrl != null) {
+		searchItems.keysUrl = keysUrl;
+	}
+	final String? collaboratorsUrl = jsonConvert.convert<String>(json['collaborators_url']);
+	if (collaboratorsUrl != null) {
+		searchItems.collaboratorsUrl = collaboratorsUrl;
+	}
+	final String? teamsUrl = jsonConvert.convert<String>(json['teams_url']);
+	if (teamsUrl != null) {
+		searchItems.teamsUrl = teamsUrl;
+	}
+	final String? hooksUrl = jsonConvert.convert<String>(json['hooks_url']);
+	if (hooksUrl != null) {
+		searchItems.hooksUrl = hooksUrl;
+	}
+	final String? issueEventsUrl = jsonConvert.convert<String>(json['issue_events_url']);
+	if (issueEventsUrl != null) {
+		searchItems.issueEventsUrl = issueEventsUrl;
+	}
+	final String? eventsUrl = jsonConvert.convert<String>(json['events_url']);
+	if (eventsUrl != null) {
+		searchItems.eventsUrl = eventsUrl;
+	}
+	final String? assigneesUrl = jsonConvert.convert<String>(json['assignees_url']);
+	if (assigneesUrl != null) {
+		searchItems.assigneesUrl = assigneesUrl;
+	}
+	final String? branchesUrl = jsonConvert.convert<String>(json['branches_url']);
+	if (branchesUrl != null) {
+		searchItems.branchesUrl = branchesUrl;
+	}
+	final String? tagsUrl = jsonConvert.convert<String>(json['tags_url']);
+	if (tagsUrl != null) {
+		searchItems.tagsUrl = tagsUrl;
+	}
+	final String? blobsUrl = jsonConvert.convert<String>(json['blobs_url']);
+	if (blobsUrl != null) {
+		searchItems.blobsUrl = blobsUrl;
+	}
+	final String? gitTagsUrl = jsonConvert.convert<String>(json['git_tags_url']);
+	if (gitTagsUrl != null) {
+		searchItems.gitTagsUrl = gitTagsUrl;
+	}
+	final String? gitRefsUrl = jsonConvert.convert<String>(json['git_refs_url']);
+	if (gitRefsUrl != null) {
+		searchItems.gitRefsUrl = gitRefsUrl;
+	}
+	final String? treesUrl = jsonConvert.convert<String>(json['trees_url']);
+	if (treesUrl != null) {
+		searchItems.treesUrl = treesUrl;
+	}
+	final String? statusesUrl = jsonConvert.convert<String>(json['statuses_url']);
+	if (statusesUrl != null) {
+		searchItems.statusesUrl = statusesUrl;
+	}
+	final String? languagesUrl = jsonConvert.convert<String>(json['languages_url']);
+	if (languagesUrl != null) {
+		searchItems.languagesUrl = languagesUrl;
+	}
+	final String? stargazersUrl = jsonConvert.convert<String>(json['stargazers_url']);
+	if (stargazersUrl != null) {
+		searchItems.stargazersUrl = stargazersUrl;
+	}
+	final String? contributorsUrl = jsonConvert.convert<String>(json['contributors_url']);
+	if (contributorsUrl != null) {
+		searchItems.contributorsUrl = contributorsUrl;
+	}
+	final String? subscribersUrl = jsonConvert.convert<String>(json['subscribers_url']);
+	if (subscribersUrl != null) {
+		searchItems.subscribersUrl = subscribersUrl;
+	}
+	final String? subscriptionUrl = jsonConvert.convert<String>(json['subscription_url']);
+	if (subscriptionUrl != null) {
+		searchItems.subscriptionUrl = subscriptionUrl;
+	}
+	final String? commitsUrl = jsonConvert.convert<String>(json['commits_url']);
+	if (commitsUrl != null) {
+		searchItems.commitsUrl = commitsUrl;
+	}
+	final String? gitCommitsUrl = jsonConvert.convert<String>(json['git_commits_url']);
+	if (gitCommitsUrl != null) {
+		searchItems.gitCommitsUrl = gitCommitsUrl;
+	}
+	final String? commentsUrl = jsonConvert.convert<String>(json['comments_url']);
+	if (commentsUrl != null) {
+		searchItems.commentsUrl = commentsUrl;
+	}
+	final String? issueCommentUrl = jsonConvert.convert<String>(json['issue_comment_url']);
+	if (issueCommentUrl != null) {
+		searchItems.issueCommentUrl = issueCommentUrl;
+	}
+	final String? contentsUrl = jsonConvert.convert<String>(json['contents_url']);
+	if (contentsUrl != null) {
+		searchItems.contentsUrl = contentsUrl;
+	}
+	final String? compareUrl = jsonConvert.convert<String>(json['compare_url']);
+	if (compareUrl != null) {
+		searchItems.compareUrl = compareUrl;
+	}
+	final String? mergesUrl = jsonConvert.convert<String>(json['merges_url']);
+	if (mergesUrl != null) {
+		searchItems.mergesUrl = mergesUrl;
+	}
+	final String? archiveUrl = jsonConvert.convert<String>(json['archive_url']);
+	if (archiveUrl != null) {
+		searchItems.archiveUrl = archiveUrl;
+	}
+	final String? downloadsUrl = jsonConvert.convert<String>(json['downloads_url']);
+	if (downloadsUrl != null) {
+		searchItems.downloadsUrl = downloadsUrl;
+	}
+	final String? issuesUrl = jsonConvert.convert<String>(json['issues_url']);
+	if (issuesUrl != null) {
+		searchItems.issuesUrl = issuesUrl;
+	}
+	final String? pullsUrl = jsonConvert.convert<String>(json['pulls_url']);
+	if (pullsUrl != null) {
+		searchItems.pullsUrl = pullsUrl;
+	}
+	final String? milestonesUrl = jsonConvert.convert<String>(json['milestones_url']);
+	if (milestonesUrl != null) {
+		searchItems.milestonesUrl = milestonesUrl;
+	}
+	final String? notificationsUrl = jsonConvert.convert<String>(json['notifications_url']);
+	if (notificationsUrl != null) {
+		searchItems.notificationsUrl = notificationsUrl;
+	}
+	final String? labelsUrl = jsonConvert.convert<String>(json['labels_url']);
+	if (labelsUrl != null) {
+		searchItems.labelsUrl = labelsUrl;
+	}
+	final String? releasesUrl = jsonConvert.convert<String>(json['releases_url']);
+	if (releasesUrl != null) {
+		searchItems.releasesUrl = releasesUrl;
+	}
+	final String? deploymentsUrl = jsonConvert.convert<String>(json['deployments_url']);
+	if (deploymentsUrl != null) {
+		searchItems.deploymentsUrl = deploymentsUrl;
+	}
+	final String? createdAt = jsonConvert.convert<String>(json['created_at']);
+	if (createdAt != null) {
+		searchItems.createdAt = createdAt;
+	}
+	final String? updatedAt = jsonConvert.convert<String>(json['updated_at']);
+	if (updatedAt != null) {
+		searchItems.updatedAt = updatedAt;
+	}
+	final String? pushedAt = jsonConvert.convert<String>(json['pushed_at']);
+	if (pushedAt != null) {
+		searchItems.pushedAt = pushedAt;
+	}
+	final String? gitUrl = jsonConvert.convert<String>(json['git_url']);
+	if (gitUrl != null) {
+		searchItems.gitUrl = gitUrl;
+	}
+	final String? sshUrl = jsonConvert.convert<String>(json['ssh_url']);
+	if (sshUrl != null) {
+		searchItems.sshUrl = sshUrl;
+	}
+	final String? cloneUrl = jsonConvert.convert<String>(json['clone_url']);
+	if (cloneUrl != null) {
+		searchItems.cloneUrl = cloneUrl;
+	}
+	final String? svnUrl = jsonConvert.convert<String>(json['svn_url']);
+	if (svnUrl != null) {
+		searchItems.svnUrl = svnUrl;
+	}
+	final String? homepage = jsonConvert.convert<String>(json['homepage']);
+	if (homepage != null) {
+		searchItems.homepage = homepage;
+	}
+	final int? size = jsonConvert.convert<int>(json['size']);
+	if (size != null) {
+		searchItems.size = size;
+	}
+	final int? stargazersCount = jsonConvert.convert<int>(json['stargazers_count']);
+	if (stargazersCount != null) {
+		searchItems.stargazersCount = stargazersCount;
+	}
+	final int? watchersCount = jsonConvert.convert<int>(json['watchers_count']);
+	if (watchersCount != null) {
+		searchItems.watchersCount = watchersCount;
+	}
+	final String? language = jsonConvert.convert<String>(json['language']);
+	if (language != null) {
+		searchItems.language = language;
+	}
+	final bool? hasIssues = jsonConvert.convert<bool>(json['has_issues']);
+	if (hasIssues != null) {
+		searchItems.hasIssues = hasIssues;
+	}
+	final bool? hasProjects = jsonConvert.convert<bool>(json['has_projects']);
+	if (hasProjects != null) {
+		searchItems.hasProjects = hasProjects;
+	}
+	final bool? hasDownloads = jsonConvert.convert<bool>(json['has_downloads']);
+	if (hasDownloads != null) {
+		searchItems.hasDownloads = hasDownloads;
+	}
+	final bool? hasWiki = jsonConvert.convert<bool>(json['has_wiki']);
+	if (hasWiki != null) {
+		searchItems.hasWiki = hasWiki;
+	}
+	final bool? hasPages = jsonConvert.convert<bool>(json['has_pages']);
+	if (hasPages != null) {
+		searchItems.hasPages = hasPages;
+	}
+	final int? forksCount = jsonConvert.convert<int>(json['forks_count']);
+	if (forksCount != null) {
+		searchItems.forksCount = forksCount;
+	}
+	final bool? archived = jsonConvert.convert<bool>(json['archived']);
+	if (archived != null) {
+		searchItems.archived = archived;
+	}
+	final bool? disabled = jsonConvert.convert<bool>(json['disabled']);
+	if (disabled != null) {
+		searchItems.disabled = disabled;
+	}
+	final int? openIssuesCount = jsonConvert.convert<int>(json['open_issues_count']);
+	if (openIssuesCount != null) {
+		searchItems.openIssuesCount = openIssuesCount;
+	}
+	final SearchItemsLicense? license = jsonConvert.convert<SearchItemsLicense>(json['license']);
+	if (license != null) {
+		searchItems.license = license;
+	}
+	final int? forks = jsonConvert.convert<int>(json['forks']);
+	if (forks != null) {
+		searchItems.forks = forks;
+	}
+	final int? openIssues = jsonConvert.convert<int>(json['open_issues']);
+	if (openIssues != null) {
+		searchItems.openIssues = openIssues;
+	}
+	final int? watchers = jsonConvert.convert<int>(json['watchers']);
+	if (watchers != null) {
+		searchItems.watchers = watchers;
+	}
+	final String? defaultBranch = jsonConvert.convert<String>(json['default_branch']);
+	if (defaultBranch != null) {
+		searchItems.defaultBranch = defaultBranch;
+	}
+	final double? score = jsonConvert.convert<double>(json['score']);
+	if (score != null) {
+		searchItems.score = score;
+	}
+	return searchItems;
+}
+
+Map<String, dynamic> $SearchItemsToJson(SearchItems entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['id'] = entity.id;
+	data['node_id'] = entity.nodeId;
+	data['name'] = entity.name;
+	data['full_name'] = entity.fullName;
+	data['private'] = entity.private;
+	data['owner'] = entity.owner?.toJson();
+	data['html_url'] = entity.htmlUrl;
+	data['description'] = entity.description;
+	data['fork'] = entity.fork;
+	data['url'] = entity.url;
+	data['forks_url'] = entity.forksUrl;
+	data['keys_url'] = entity.keysUrl;
+	data['collaborators_url'] = entity.collaboratorsUrl;
+	data['teams_url'] = entity.teamsUrl;
+	data['hooks_url'] = entity.hooksUrl;
+	data['issue_events_url'] = entity.issueEventsUrl;
+	data['events_url'] = entity.eventsUrl;
+	data['assignees_url'] = entity.assigneesUrl;
+	data['branches_url'] = entity.branchesUrl;
+	data['tags_url'] = entity.tagsUrl;
+	data['blobs_url'] = entity.blobsUrl;
+	data['git_tags_url'] = entity.gitTagsUrl;
+	data['git_refs_url'] = entity.gitRefsUrl;
+	data['trees_url'] = entity.treesUrl;
+	data['statuses_url'] = entity.statusesUrl;
+	data['languages_url'] = entity.languagesUrl;
+	data['stargazers_url'] = entity.stargazersUrl;
+	data['contributors_url'] = entity.contributorsUrl;
+	data['subscribers_url'] = entity.subscribersUrl;
+	data['subscription_url'] = entity.subscriptionUrl;
+	data['commits_url'] = entity.commitsUrl;
+	data['git_commits_url'] = entity.gitCommitsUrl;
+	data['comments_url'] = entity.commentsUrl;
+	data['issue_comment_url'] = entity.issueCommentUrl;
+	data['contents_url'] = entity.contentsUrl;
+	data['compare_url'] = entity.compareUrl;
+	data['merges_url'] = entity.mergesUrl;
+	data['archive_url'] = entity.archiveUrl;
+	data['downloads_url'] = entity.downloadsUrl;
+	data['issues_url'] = entity.issuesUrl;
+	data['pulls_url'] = entity.pullsUrl;
+	data['milestones_url'] = entity.milestonesUrl;
+	data['notifications_url'] = entity.notificationsUrl;
+	data['labels_url'] = entity.labelsUrl;
+	data['releases_url'] = entity.releasesUrl;
+	data['deployments_url'] = entity.deploymentsUrl;
+	data['created_at'] = entity.createdAt;
+	data['updated_at'] = entity.updatedAt;
+	data['pushed_at'] = entity.pushedAt;
+	data['git_url'] = entity.gitUrl;
+	data['ssh_url'] = entity.sshUrl;
+	data['clone_url'] = entity.cloneUrl;
+	data['svn_url'] = entity.svnUrl;
+	data['homepage'] = entity.homepage;
+	data['size'] = entity.size;
+	data['stargazers_count'] = entity.stargazersCount;
+	data['watchers_count'] = entity.watchersCount;
+	data['language'] = entity.language;
+	data['has_issues'] = entity.hasIssues;
+	data['has_projects'] = entity.hasProjects;
+	data['has_downloads'] = entity.hasDownloads;
+	data['has_wiki'] = entity.hasWiki;
+	data['has_pages'] = entity.hasPages;
+	data['forks_count'] = entity.forksCount;
+	data['archived'] = entity.archived;
+	data['disabled'] = entity.disabled;
+	data['open_issues_count'] = entity.openIssuesCount;
+	data['license'] = entity.license?.toJson();
+	data['forks'] = entity.forks;
+	data['open_issues'] = entity.openIssues;
+	data['watchers'] = entity.watchers;
+	data['default_branch'] = entity.defaultBranch;
+	data['score'] = entity.score;
+	return data;
+}
+
+SearchItemsOwner $SearchItemsOwnerFromJson(Map<String, dynamic> json) {
+	final SearchItemsOwner searchItemsOwner = SearchItemsOwner();
+	final String? login = jsonConvert.convert<String>(json['login']);
+	if (login != null) {
+		searchItemsOwner.login = login;
+	}
+	final int? id = jsonConvert.convert<int>(json['id']);
+	if (id != null) {
+		searchItemsOwner.id = id;
+	}
+	final String? nodeId = jsonConvert.convert<String>(json['node_id']);
+	if (nodeId != null) {
+		searchItemsOwner.nodeId = nodeId;
+	}
+	final String? avatarUrl = jsonConvert.convert<String>(json['avatar_url']);
+	if (avatarUrl != null) {
+		searchItemsOwner.avatarUrl = avatarUrl;
+	}
+	final String? gravatarId = jsonConvert.convert<String>(json['gravatar_id']);
+	if (gravatarId != null) {
+		searchItemsOwner.gravatarId = gravatarId;
+	}
+	final String? url = jsonConvert.convert<String>(json['url']);
+	if (url != null) {
+		searchItemsOwner.url = url;
+	}
+	final String? htmlUrl = jsonConvert.convert<String>(json['html_url']);
+	if (htmlUrl != null) {
+		searchItemsOwner.htmlUrl = htmlUrl;
+	}
+	final String? followersUrl = jsonConvert.convert<String>(json['followers_url']);
+	if (followersUrl != null) {
+		searchItemsOwner.followersUrl = followersUrl;
+	}
+	final String? followingUrl = jsonConvert.convert<String>(json['following_url']);
+	if (followingUrl != null) {
+		searchItemsOwner.followingUrl = followingUrl;
+	}
+	final String? gistsUrl = jsonConvert.convert<String>(json['gists_url']);
+	if (gistsUrl != null) {
+		searchItemsOwner.gistsUrl = gistsUrl;
+	}
+	final String? starredUrl = jsonConvert.convert<String>(json['starred_url']);
+	if (starredUrl != null) {
+		searchItemsOwner.starredUrl = starredUrl;
+	}
+	final String? subscriptionsUrl = jsonConvert.convert<String>(json['subscriptions_url']);
+	if (subscriptionsUrl != null) {
+		searchItemsOwner.subscriptionsUrl = subscriptionsUrl;
+	}
+	final String? organizationsUrl = jsonConvert.convert<String>(json['organizations_url']);
+	if (organizationsUrl != null) {
+		searchItemsOwner.organizationsUrl = organizationsUrl;
+	}
+	final String? reposUrl = jsonConvert.convert<String>(json['repos_url']);
+	if (reposUrl != null) {
+		searchItemsOwner.reposUrl = reposUrl;
+	}
+	final String? eventsUrl = jsonConvert.convert<String>(json['events_url']);
+	if (eventsUrl != null) {
+		searchItemsOwner.eventsUrl = eventsUrl;
+	}
+	final String? receivedEventsUrl = jsonConvert.convert<String>(json['received_events_url']);
+	if (receivedEventsUrl != null) {
+		searchItemsOwner.receivedEventsUrl = receivedEventsUrl;
+	}
+	final String? type = jsonConvert.convert<String>(json['type']);
+	if (type != null) {
+		searchItemsOwner.type = type;
+	}
+	final bool? siteAdmin = jsonConvert.convert<bool>(json['site_admin']);
+	if (siteAdmin != null) {
+		searchItemsOwner.siteAdmin = siteAdmin;
+	}
+	return searchItemsOwner;
+}
+
+Map<String, dynamic> $SearchItemsOwnerToJson(SearchItemsOwner entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['login'] = entity.login;
+	data['id'] = entity.id;
+	data['node_id'] = entity.nodeId;
+	data['avatar_url'] = entity.avatarUrl;
+	data['gravatar_id'] = entity.gravatarId;
+	data['url'] = entity.url;
+	data['html_url'] = entity.htmlUrl;
+	data['followers_url'] = entity.followersUrl;
+	data['following_url'] = entity.followingUrl;
+	data['gists_url'] = entity.gistsUrl;
+	data['starred_url'] = entity.starredUrl;
+	data['subscriptions_url'] = entity.subscriptionsUrl;
+	data['organizations_url'] = entity.organizationsUrl;
+	data['repos_url'] = entity.reposUrl;
+	data['events_url'] = entity.eventsUrl;
+	data['received_events_url'] = entity.receivedEventsUrl;
+	data['type'] = entity.type;
+	data['site_admin'] = entity.siteAdmin;
+	return data;
+}
+
+SearchItemsLicense $SearchItemsLicenseFromJson(Map<String, dynamic> json) {
+	final SearchItemsLicense searchItemsLicense = SearchItemsLicense();
+	final String? key = jsonConvert.convert<String>(json['key']);
+	if (key != null) {
+		searchItemsLicense.key = key;
+	}
+	final String? name = jsonConvert.convert<String>(json['name']);
+	if (name != null) {
+		searchItemsLicense.name = name;
+	}
+	final String? spdxId = jsonConvert.convert<String>(json['spdx_id']);
+	if (spdxId != null) {
+		searchItemsLicense.spdxId = spdxId;
+	}
+	final String? url = jsonConvert.convert<String>(json['url']);
+	if (url != null) {
+		searchItemsLicense.url = url;
+	}
+	final String? nodeId = jsonConvert.convert<String>(json['node_id']);
+	if (nodeId != null) {
+		searchItemsLicense.nodeId = nodeId;
+	}
+	return searchItemsLicense;
+}
+
+Map<String, dynamic> $SearchItemsLicenseToJson(SearchItemsLicense entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['key'] = entity.key;
+	data['name'] = entity.name;
+	data['spdx_id'] = entity.spdxId;
+	data['url'] = entity.url;
+	data['node_id'] = entity.nodeId;
+	return data;
+}
\ No newline at end of file
diff --git a/lib/generated/json/search_entity_helper.dart b/lib/generated/json/search_entity_helper.dart
deleted file mode 100644
index e4473916d..000000000
--- a/lib/generated/json/search_entity_helper.dart
+++ /dev/null
@@ -1,457 +0,0 @@
-import 'package:flutter_deer/order/models/search_entity.dart';
-
-searchEntityFromJson(SearchEntity data, Map<String, dynamic> json) {
-	if (json['total_count'] != null) {
-		data.totalCount = json['total_count'] is String
-				? int.tryParse(json['total_count'])
-				: json['total_count'].toInt();
-	}
-	if (json['incomplete_results'] != null) {
-		data.incompleteResults = json['incomplete_results'];
-	}
-	if (json['items'] != null) {
-		data.items = (json['items'] as List).map((v) => SearchItems().fromJson(v)).toList();
-	}
-	return data;
-}
-
-Map<String, dynamic> searchEntityToJson(SearchEntity entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['total_count'] = entity.totalCount;
-	data['incomplete_results'] = entity.incompleteResults;
-	data['items'] =  entity.items?.map((v) => v.toJson()).toList();
-	return data;
-}
-
-searchItemsFromJson(SearchItems data, Map<String, dynamic> json) {
-	if (json['id'] != null) {
-		data.id = json['id'] is String
-				? int.tryParse(json['id'])
-				: json['id'].toInt();
-	}
-	if (json['node_id'] != null) {
-		data.nodeId = json['node_id'].toString();
-	}
-	if (json['name'] != null) {
-		data.name = json['name'].toString();
-	}
-	if (json['full_name'] != null) {
-		data.fullName = json['full_name'].toString();
-	}
-	if (json['private'] != null) {
-		data.private = json['private'];
-	}
-	if (json['owner'] != null) {
-		data.owner = SearchItemsOwner().fromJson(json['owner']);
-	}
-	if (json['html_url'] != null) {
-		data.htmlUrl = json['html_url'].toString();
-	}
-	if (json['description'] != null) {
-		data.description = json['description'].toString();
-	}
-	if (json['fork'] != null) {
-		data.fork = json['fork'];
-	}
-	if (json['url'] != null) {
-		data.url = json['url'].toString();
-	}
-	if (json['forks_url'] != null) {
-		data.forksUrl = json['forks_url'].toString();
-	}
-	if (json['keys_url'] != null) {
-		data.keysUrl = json['keys_url'].toString();
-	}
-	if (json['collaborators_url'] != null) {
-		data.collaboratorsUrl = json['collaborators_url'].toString();
-	}
-	if (json['teams_url'] != null) {
-		data.teamsUrl = json['teams_url'].toString();
-	}
-	if (json['hooks_url'] != null) {
-		data.hooksUrl = json['hooks_url'].toString();
-	}
-	if (json['issue_events_url'] != null) {
-		data.issueEventsUrl = json['issue_events_url'].toString();
-	}
-	if (json['events_url'] != null) {
-		data.eventsUrl = json['events_url'].toString();
-	}
-	if (json['assignees_url'] != null) {
-		data.assigneesUrl = json['assignees_url'].toString();
-	}
-	if (json['branches_url'] != null) {
-		data.branchesUrl = json['branches_url'].toString();
-	}
-	if (json['tags_url'] != null) {
-		data.tagsUrl = json['tags_url'].toString();
-	}
-	if (json['blobs_url'] != null) {
-		data.blobsUrl = json['blobs_url'].toString();
-	}
-	if (json['git_tags_url'] != null) {
-		data.gitTagsUrl = json['git_tags_url'].toString();
-	}
-	if (json['git_refs_url'] != null) {
-		data.gitRefsUrl = json['git_refs_url'].toString();
-	}
-	if (json['trees_url'] != null) {
-		data.treesUrl = json['trees_url'].toString();
-	}
-	if (json['statuses_url'] != null) {
-		data.statusesUrl = json['statuses_url'].toString();
-	}
-	if (json['languages_url'] != null) {
-		data.languagesUrl = json['languages_url'].toString();
-	}
-	if (json['stargazers_url'] != null) {
-		data.stargazersUrl = json['stargazers_url'].toString();
-	}
-	if (json['contributors_url'] != null) {
-		data.contributorsUrl = json['contributors_url'].toString();
-	}
-	if (json['subscribers_url'] != null) {
-		data.subscribersUrl = json['subscribers_url'].toString();
-	}
-	if (json['subscription_url'] != null) {
-		data.subscriptionUrl = json['subscription_url'].toString();
-	}
-	if (json['commits_url'] != null) {
-		data.commitsUrl = json['commits_url'].toString();
-	}
-	if (json['git_commits_url'] != null) {
-		data.gitCommitsUrl = json['git_commits_url'].toString();
-	}
-	if (json['comments_url'] != null) {
-		data.commentsUrl = json['comments_url'].toString();
-	}
-	if (json['issue_comment_url'] != null) {
-		data.issueCommentUrl = json['issue_comment_url'].toString();
-	}
-	if (json['contents_url'] != null) {
-		data.contentsUrl = json['contents_url'].toString();
-	}
-	if (json['compare_url'] != null) {
-		data.compareUrl = json['compare_url'].toString();
-	}
-	if (json['merges_url'] != null) {
-		data.mergesUrl = json['merges_url'].toString();
-	}
-	if (json['archive_url'] != null) {
-		data.archiveUrl = json['archive_url'].toString();
-	}
-	if (json['downloads_url'] != null) {
-		data.downloadsUrl = json['downloads_url'].toString();
-	}
-	if (json['issues_url'] != null) {
-		data.issuesUrl = json['issues_url'].toString();
-	}
-	if (json['pulls_url'] != null) {
-		data.pullsUrl = json['pulls_url'].toString();
-	}
-	if (json['milestones_url'] != null) {
-		data.milestonesUrl = json['milestones_url'].toString();
-	}
-	if (json['notifications_url'] != null) {
-		data.notificationsUrl = json['notifications_url'].toString();
-	}
-	if (json['labels_url'] != null) {
-		data.labelsUrl = json['labels_url'].toString();
-	}
-	if (json['releases_url'] != null) {
-		data.releasesUrl = json['releases_url'].toString();
-	}
-	if (json['deployments_url'] != null) {
-		data.deploymentsUrl = json['deployments_url'].toString();
-	}
-	if (json['created_at'] != null) {
-		data.createdAt = json['created_at'].toString();
-	}
-	if (json['updated_at'] != null) {
-		data.updatedAt = json['updated_at'].toString();
-	}
-	if (json['pushed_at'] != null) {
-		data.pushedAt = json['pushed_at'].toString();
-	}
-	if (json['git_url'] != null) {
-		data.gitUrl = json['git_url'].toString();
-	}
-	if (json['ssh_url'] != null) {
-		data.sshUrl = json['ssh_url'].toString();
-	}
-	if (json['clone_url'] != null) {
-		data.cloneUrl = json['clone_url'].toString();
-	}
-	if (json['svn_url'] != null) {
-		data.svnUrl = json['svn_url'].toString();
-	}
-	if (json['homepage'] != null) {
-		data.homepage = json['homepage'].toString();
-	}
-	if (json['size'] != null) {
-		data.size = json['size'] is String
-				? int.tryParse(json['size'])
-				: json['size'].toInt();
-	}
-	if (json['stargazers_count'] != null) {
-		data.stargazersCount = json['stargazers_count'] is String
-				? int.tryParse(json['stargazers_count'])
-				: json['stargazers_count'].toInt();
-	}
-	if (json['watchers_count'] != null) {
-		data.watchersCount = json['watchers_count'] is String
-				? int.tryParse(json['watchers_count'])
-				: json['watchers_count'].toInt();
-	}
-	if (json['language'] != null) {
-		data.language = json['language'].toString();
-	}
-	if (json['has_issues'] != null) {
-		data.hasIssues = json['has_issues'];
-	}
-	if (json['has_projects'] != null) {
-		data.hasProjects = json['has_projects'];
-	}
-	if (json['has_downloads'] != null) {
-		data.hasDownloads = json['has_downloads'];
-	}
-	if (json['has_wiki'] != null) {
-		data.hasWiki = json['has_wiki'];
-	}
-	if (json['has_pages'] != null) {
-		data.hasPages = json['has_pages'];
-	}
-	if (json['forks_count'] != null) {
-		data.forksCount = json['forks_count'] is String
-				? int.tryParse(json['forks_count'])
-				: json['forks_count'].toInt();
-	}
-	if (json['archived'] != null) {
-		data.archived = json['archived'];
-	}
-	if (json['disabled'] != null) {
-		data.disabled = json['disabled'];
-	}
-	if (json['open_issues_count'] != null) {
-		data.openIssuesCount = json['open_issues_count'] is String
-				? int.tryParse(json['open_issues_count'])
-				: json['open_issues_count'].toInt();
-	}
-	if (json['license'] != null) {
-		data.license = SearchItemsLicense().fromJson(json['license']);
-	}
-	if (json['forks'] != null) {
-		data.forks = json['forks'] is String
-				? int.tryParse(json['forks'])
-				: json['forks'].toInt();
-	}
-	if (json['open_issues'] != null) {
-		data.openIssues = json['open_issues'] is String
-				? int.tryParse(json['open_issues'])
-				: json['open_issues'].toInt();
-	}
-	if (json['watchers'] != null) {
-		data.watchers = json['watchers'] is String
-				? int.tryParse(json['watchers'])
-				: json['watchers'].toInt();
-	}
-	if (json['default_branch'] != null) {
-		data.defaultBranch = json['default_branch'].toString();
-	}
-	if (json['score'] != null) {
-		data.score = json['score'] is String
-				? double.tryParse(json['score'])
-				: json['score'].toDouble();
-	}
-	return data;
-}
-
-Map<String, dynamic> searchItemsToJson(SearchItems entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['id'] = entity.id;
-	data['node_id'] = entity.nodeId;
-	data['name'] = entity.name;
-	data['full_name'] = entity.fullName;
-	data['private'] = entity.private;
-	data['owner'] = entity.owner?.toJson();
-	data['html_url'] = entity.htmlUrl;
-	data['description'] = entity.description;
-	data['fork'] = entity.fork;
-	data['url'] = entity.url;
-	data['forks_url'] = entity.forksUrl;
-	data['keys_url'] = entity.keysUrl;
-	data['collaborators_url'] = entity.collaboratorsUrl;
-	data['teams_url'] = entity.teamsUrl;
-	data['hooks_url'] = entity.hooksUrl;
-	data['issue_events_url'] = entity.issueEventsUrl;
-	data['events_url'] = entity.eventsUrl;
-	data['assignees_url'] = entity.assigneesUrl;
-	data['branches_url'] = entity.branchesUrl;
-	data['tags_url'] = entity.tagsUrl;
-	data['blobs_url'] = entity.blobsUrl;
-	data['git_tags_url'] = entity.gitTagsUrl;
-	data['git_refs_url'] = entity.gitRefsUrl;
-	data['trees_url'] = entity.treesUrl;
-	data['statuses_url'] = entity.statusesUrl;
-	data['languages_url'] = entity.languagesUrl;
-	data['stargazers_url'] = entity.stargazersUrl;
-	data['contributors_url'] = entity.contributorsUrl;
-	data['subscribers_url'] = entity.subscribersUrl;
-	data['subscription_url'] = entity.subscriptionUrl;
-	data['commits_url'] = entity.commitsUrl;
-	data['git_commits_url'] = entity.gitCommitsUrl;
-	data['comments_url'] = entity.commentsUrl;
-	data['issue_comment_url'] = entity.issueCommentUrl;
-	data['contents_url'] = entity.contentsUrl;
-	data['compare_url'] = entity.compareUrl;
-	data['merges_url'] = entity.mergesUrl;
-	data['archive_url'] = entity.archiveUrl;
-	data['downloads_url'] = entity.downloadsUrl;
-	data['issues_url'] = entity.issuesUrl;
-	data['pulls_url'] = entity.pullsUrl;
-	data['milestones_url'] = entity.milestonesUrl;
-	data['notifications_url'] = entity.notificationsUrl;
-	data['labels_url'] = entity.labelsUrl;
-	data['releases_url'] = entity.releasesUrl;
-	data['deployments_url'] = entity.deploymentsUrl;
-	data['created_at'] = entity.createdAt;
-	data['updated_at'] = entity.updatedAt;
-	data['pushed_at'] = entity.pushedAt;
-	data['git_url'] = entity.gitUrl;
-	data['ssh_url'] = entity.sshUrl;
-	data['clone_url'] = entity.cloneUrl;
-	data['svn_url'] = entity.svnUrl;
-	data['homepage'] = entity.homepage;
-	data['size'] = entity.size;
-	data['stargazers_count'] = entity.stargazersCount;
-	data['watchers_count'] = entity.watchersCount;
-	data['language'] = entity.language;
-	data['has_issues'] = entity.hasIssues;
-	data['has_projects'] = entity.hasProjects;
-	data['has_downloads'] = entity.hasDownloads;
-	data['has_wiki'] = entity.hasWiki;
-	data['has_pages'] = entity.hasPages;
-	data['forks_count'] = entity.forksCount;
-	data['archived'] = entity.archived;
-	data['disabled'] = entity.disabled;
-	data['open_issues_count'] = entity.openIssuesCount;
-	data['license'] = entity.license?.toJson();
-	data['forks'] = entity.forks;
-	data['open_issues'] = entity.openIssues;
-	data['watchers'] = entity.watchers;
-	data['default_branch'] = entity.defaultBranch;
-	data['score'] = entity.score;
-	return data;
-}
-
-searchItemsOwnerFromJson(SearchItemsOwner data, Map<String, dynamic> json) {
-	if (json['login'] != null) {
-		data.login = json['login'].toString();
-	}
-	if (json['id'] != null) {
-		data.id = json['id'] is String
-				? int.tryParse(json['id'])
-				: json['id'].toInt();
-	}
-	if (json['node_id'] != null) {
-		data.nodeId = json['node_id'].toString();
-	}
-	if (json['avatar_url'] != null) {
-		data.avatarUrl = json['avatar_url'].toString();
-	}
-	if (json['gravatar_id'] != null) {
-		data.gravatarId = json['gravatar_id'].toString();
-	}
-	if (json['url'] != null) {
-		data.url = json['url'].toString();
-	}
-	if (json['html_url'] != null) {
-		data.htmlUrl = json['html_url'].toString();
-	}
-	if (json['followers_url'] != null) {
-		data.followersUrl = json['followers_url'].toString();
-	}
-	if (json['following_url'] != null) {
-		data.followingUrl = json['following_url'].toString();
-	}
-	if (json['gists_url'] != null) {
-		data.gistsUrl = json['gists_url'].toString();
-	}
-	if (json['starred_url'] != null) {
-		data.starredUrl = json['starred_url'].toString();
-	}
-	if (json['subscriptions_url'] != null) {
-		data.subscriptionsUrl = json['subscriptions_url'].toString();
-	}
-	if (json['organizations_url'] != null) {
-		data.organizationsUrl = json['organizations_url'].toString();
-	}
-	if (json['repos_url'] != null) {
-		data.reposUrl = json['repos_url'].toString();
-	}
-	if (json['events_url'] != null) {
-		data.eventsUrl = json['events_url'].toString();
-	}
-	if (json['received_events_url'] != null) {
-		data.receivedEventsUrl = json['received_events_url'].toString();
-	}
-	if (json['type'] != null) {
-		data.type = json['type'].toString();
-	}
-	if (json['site_admin'] != null) {
-		data.siteAdmin = json['site_admin'];
-	}
-	return data;
-}
-
-Map<String, dynamic> searchItemsOwnerToJson(SearchItemsOwner entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['login'] = entity.login;
-	data['id'] = entity.id;
-	data['node_id'] = entity.nodeId;
-	data['avatar_url'] = entity.avatarUrl;
-	data['gravatar_id'] = entity.gravatarId;
-	data['url'] = entity.url;
-	data['html_url'] = entity.htmlUrl;
-	data['followers_url'] = entity.followersUrl;
-	data['following_url'] = entity.followingUrl;
-	data['gists_url'] = entity.gistsUrl;
-	data['starred_url'] = entity.starredUrl;
-	data['subscriptions_url'] = entity.subscriptionsUrl;
-	data['organizations_url'] = entity.organizationsUrl;
-	data['repos_url'] = entity.reposUrl;
-	data['events_url'] = entity.eventsUrl;
-	data['received_events_url'] = entity.receivedEventsUrl;
-	data['type'] = entity.type;
-	data['site_admin'] = entity.siteAdmin;
-	return data;
-}
-
-searchItemsLicenseFromJson(SearchItemsLicense data, Map<String, dynamic> json) {
-	if (json['key'] != null) {
-		data.key = json['key'].toString();
-	}
-	if (json['name'] != null) {
-		data.name = json['name'].toString();
-	}
-	if (json['spdx_id'] != null) {
-		data.spdxId = json['spdx_id'].toString();
-	}
-	if (json['url'] != null) {
-		data.url = json['url'].toString();
-	}
-	if (json['node_id'] != null) {
-		data.nodeId = json['node_id'].toString();
-	}
-	return data;
-}
-
-Map<String, dynamic> searchItemsLicenseToJson(SearchItemsLicense entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['key'] = entity.key;
-	data['name'] = entity.name;
-	data['spdx_id'] = entity.spdxId;
-	data['url'] = entity.url;
-	data['node_id'] = entity.nodeId;
-	return data;
-}
\ No newline at end of file
diff --git a/lib/generated/json/user_entity.g.dart b/lib/generated/json/user_entity.g.dart
new file mode 100644
index 000000000..d93d86d23
--- /dev/null
+++ b/lib/generated/json/user_entity.g.dart
@@ -0,0 +1,32 @@
+import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/shop/models/user_entity.dart';
+
+UserEntity $UserEntityFromJson(Map<String, dynamic> json) {
+	final UserEntity userEntity = UserEntity();
+	final String? avatarUrl = jsonConvert.convert<String>(json['avatar_url']);
+	if (avatarUrl != null) {
+		userEntity.avatarUrl = avatarUrl;
+	}
+	final String? name = jsonConvert.convert<String>(json['name']);
+	if (name != null) {
+		userEntity.name = name;
+	}
+	final int? id = jsonConvert.convert<int>(json['id']);
+	if (id != null) {
+		userEntity.id = id;
+	}
+	final String? blog = jsonConvert.convert<String>(json['blog']);
+	if (blog != null) {
+		userEntity.blog = blog;
+	}
+	return userEntity;
+}
+
+Map<String, dynamic> $UserEntityToJson(UserEntity entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['avatar_url'] = entity.avatarUrl;
+	data['name'] = entity.name;
+	data['id'] = entity.id;
+	data['blog'] = entity.blog;
+	return data;
+}
\ No newline at end of file
diff --git a/lib/generated/json/user_entity_helper.dart b/lib/generated/json/user_entity_helper.dart
deleted file mode 100644
index f3ebc23a0..000000000
--- a/lib/generated/json/user_entity_helper.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:flutter_deer/shop/models/user_entity.dart';
-
-userEntityFromJson(UserEntity data, Map<String, dynamic> json) {
-	if (json['avatar_url'] != null) {
-		data.avatarUrl = json['avatar_url'].toString();
-	}
-	if (json['name'] != null) {
-		data.name = json['name'].toString();
-	}
-	if (json['id'] != null) {
-		data.id = json['id'] is String
-				? int.tryParse(json['id'])
-				: json['id'].toInt();
-	}
-	if (json['blog'] != null) {
-		data.blog = json['blog'].toString();
-	}
-	return data;
-}
-
-Map<String, dynamic> userEntityToJson(UserEntity entity) {
-	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['avatar_url'] = entity.avatarUrl;
-	data['name'] = entity.name;
-	data['id'] = entity.id;
-	data['blog'] = entity.blog;
-	return data;
-}
\ No newline at end of file
diff --git a/lib/goods/models/goods_sort_entity.dart b/lib/goods/models/goods_sort_entity.dart
index f8ba8c787..9c28a230d 100644
--- a/lib/goods/models/goods_sort_entity.dart
+++ b/lib/goods/models/goods_sort_entity.dart
@@ -1,6 +1,16 @@
-import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+import 'package:flutter_deer/generated/json/base/json_field.dart';
+import 'package:flutter_deer/generated/json/goods_sort_entity.g.dart';
+
+
+@JsonSerializable()
+class GoodsSortEntity {
+
+	GoodsSortEntity();
+
+	factory GoodsSortEntity.fromJson(Map<String, dynamic> json) => $GoodsSortEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $GoodsSortEntityToJson(this);
 
-class GoodsSortEntity with JsonConvert<GoodsSortEntity> {
 	late String id;
 	late String name;
 }
diff --git a/lib/goods/provider/goods_sort_provider.dart b/lib/goods/provider/goods_sort_provider.dart
index 2348c6dec..d3ab3128c 100644
--- a/lib/goods/provider/goods_sort_provider.dart
+++ b/lib/goods/provider/goods_sort_provider.dart
@@ -76,15 +76,15 @@ class GoodsSortProvider extends ChangeNotifier {
 
     // 模拟数据，数据为固定的三个列表
     rootBundle.loadString('assets/data/sort_0.json').then((String value) {
-      _mGoodsSort = JsonConvert.fromJsonAsT<List<GoodsSortEntity>>(json.decode(value));
+      _mGoodsSort = JsonConvert.fromJsonAsT<List<GoodsSortEntity>>(json.decode(value)) ?? [];
       _mList = _mGoodsSort;
       notifyListeners();
     });
     rootBundle.loadString('assets/data/sort_1.json').then((String value) {
-      _mGoodsSort1 = JsonConvert.fromJsonAsT<List<GoodsSortEntity>>(json.decode(value));
+      _mGoodsSort1 = JsonConvert.fromJsonAsT<List<GoodsSortEntity>>(json.decode(value)) ?? [];
     });
     rootBundle.loadString('assets/data/sort_2.json').then((String value) {
-      _mGoodsSort2 = JsonConvert.fromJsonAsT<List<GoodsSortEntity>>(json.decode(value));
+      _mGoodsSort2 = JsonConvert.fromJsonAsT<List<GoodsSortEntity>>(json.decode(value)) ?? [];
     });
   }
 }
diff --git a/lib/net/base_entity.dart b/lib/net/base_entity.dart
index 4dd7ea510..0c9376172 100644
--- a/lib/net/base_entity.dart
+++ b/lib/net/base_entity.dart
@@ -17,7 +17,7 @@ class BaseEntity<T> {
   late String message;
   T? data;
 
-  T _generateOBJ<O>(Object json) {
+  T? _generateOBJ<O>(Object json) {
     if (T.toString() == 'String') {
       return json.toString() as T;
     } else if (T.toString() == 'Map<dynamic, dynamic>') {
diff --git a/lib/order/models/search_entity.dart b/lib/order/models/search_entity.dart
index 8c01653ff..85f2c0ba6 100644
--- a/lib/order/models/search_entity.dart
+++ b/lib/order/models/search_entity.dart
@@ -1,7 +1,15 @@
-import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
 import 'package:flutter_deer/generated/json/base/json_field.dart';
+import 'package:flutter_deer/generated/json/search_entity.g.dart';
+
+@JsonSerializable()
+class SearchEntity {
+
+	SearchEntity();
+
+	factory SearchEntity.fromJson(Map<String, dynamic> json) => $SearchEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $SearchEntityToJson(this);
 
-class SearchEntity with JsonConvert<SearchEntity> {
 	@JSONField(name: 'total_count')
 	int? totalCount;
 	@JSONField(name: 'incomplete_results')
@@ -9,7 +17,15 @@ class SearchEntity with JsonConvert<SearchEntity> {
 	List<SearchItems>? items;
 }
 
-class SearchItems with JsonConvert<SearchItems> {
+@JsonSerializable()
+class SearchItems {
+
+	SearchItems();
+
+	factory SearchItems.fromJson(Map<String, dynamic> json) => $SearchItemsFromJson(json);
+
+	Map<String, dynamic> toJson() => $SearchItemsToJson(this);
+
 	int? id;
 	@JSONField(name: 'node_id')
 	String? nodeId;
@@ -142,7 +158,15 @@ class SearchItems with JsonConvert<SearchItems> {
 	double? score;
 }
 
-class SearchItemsOwner with JsonConvert<SearchItemsOwner> {
+@JsonSerializable()
+class SearchItemsOwner {
+
+	SearchItemsOwner();
+
+	factory SearchItemsOwner.fromJson(Map<String, dynamic> json) => $SearchItemsOwnerFromJson(json);
+
+	Map<String, dynamic> toJson() => $SearchItemsOwnerToJson(this);
+
 	String? login;
 	int? id;
 	@JSONField(name: 'node_id')
@@ -177,7 +201,15 @@ class SearchItemsOwner with JsonConvert<SearchItemsOwner> {
 	bool? siteAdmin;
 }
 
-class SearchItemsLicense with JsonConvert<SearchItemsLicense> {
+@JsonSerializable()
+class SearchItemsLicense {
+
+	SearchItemsLicense();
+
+	factory SearchItemsLicense.fromJson(Map<String, dynamic> json) => $SearchItemsLicenseFromJson(json);
+
+	Map<String, dynamic> toJson() => $SearchItemsLicenseToJson(this);
+
 	String? key;
 	String? name;
 	@JSONField(name: 'spdx_id')
diff --git a/lib/shop/models/user_entity.dart b/lib/shop/models/user_entity.dart
index 647ff72ae..758c7374d 100644
--- a/lib/shop/models/user_entity.dart
+++ b/lib/shop/models/user_entity.dart
@@ -1,7 +1,15 @@
-import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
 import 'package:flutter_deer/generated/json/base/json_field.dart';
+import 'package:flutter_deer/generated/json/user_entity.g.dart';
+
+@JsonSerializable()
+class UserEntity {
+
+	UserEntity();
+
+	factory UserEntity.fromJson(Map<String, dynamic> json) => $UserEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $UserEntityToJson(this);
 
-class UserEntity with JsonConvert<UserEntity> {
 	@JSONField(name: 'avatar_url')
 	String? avatarUrl;
 	String? name;