切换正式环境，安卓319版本上线

app/android/app/build.gradle

@@ -50,8 +50,8 @@ android {
         applicationId "com.guadou.yyemployer"
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 318
-        versionName "3.1.8"
+        versionCode 319
+        versionName "3.1.9"
 
         multiDexEnabled true
 

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

@@ -985,320 +985,69 @@ class JsonConvert {
           .toList() as M;
     }
     if (<UkJobAppliedReviseLogRecordsContentStatus>[] is M) {
-      return data.map<UkJobAppliedReviseLogRecordsContentStatus>((
-          Map<String, dynamic> e) =>
-          UkJobAppliedReviseLogRecordsContentStatus.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedReviseLogRecordsContentStatus>((Map<String, dynamic> e) => UkJobAppliedReviseLogRecordsContentStatus.fromJson(e))
+          .toList() as M;
     }
     if (<UkJobAppliedReviseLogRecordsContentReason>[] is M) {
-      return data.map<UkJobAppliedReviseLogRecordsContentReason>((
-          Map<String, dynamic> e) =>
-          UkJobAppliedReviseLogRecordsContentReason.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedReviseLogRecordsContentReason>((Map<String, dynamic> e) => UkJobAppliedReviseLogRecordsContentReason.fromJson(e))
+          .toList() as M;
     }
     if (<UkJobAppliedStaffListEntity>[] is M) {
-      return data.map<UkJobAppliedStaffListEntity>((Map<String, dynamic> e) =>
-          UkJobAppliedStaffListEntity.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedStaffListEntity>((Map<String, dynamic> e) => UkJobAppliedStaffListEntity.fromJson(e)).toList() as M;
     }
     if (<UkJobAppliedStaffListRows>[] is M) {
-      return data.map<UkJobAppliedStaffListRows>((Map<String, dynamic> e) =>
-          UkJobAppliedStaffListRows.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedStaffListRows>((Map<String, dynamic> e) => UkJobAppliedStaffListRows.fromJson(e)).toList() as M;
     }
     if (<UkJobAppliedStaffListRowsSecurityIn>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsSecurityIn>((
-          Map<String, dynamic> e) =>
-          UkJobAppliedStaffListRowsSecurityIn.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedStaffListRowsSecurityIn>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsSecurityIn.fromJson(e)).toList() as M;
     }
     if (<UkJobAppliedStaffListRowsSecurityOut>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsSecurityOut>((
-          Map<String, dynamic> e) =>
-          UkJobAppliedStaffListRowsSecurityOut.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedStaffListRowsSecurityOut>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsSecurityOut.fromJson(e)).toList() as M;
     }
     if (<UkJobAppliedStaffListRowsWorkIn>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsWorkIn>((
-          Map<String, dynamic> e) =>
-          UkJobAppliedStaffListRowsWorkIn.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedStaffListRowsWorkIn>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsWorkIn.fromJson(e)).toList() as M;
     }
     if (<UkJobAppliedStaffListRowsWorkOut>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsWorkOut>((
-          Map<String, dynamic> e) =>
-          UkJobAppliedStaffListRowsWorkOut.fromJson(e)).toList() as M;
+      return data.map<UkJobAppliedStaffListRowsWorkOut>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsWorkOut.fromJson(e)).toList() as M;
     }
     if (<UkJobListAppliedStaffSearchEntity>[] is M) {
-      return data.map<UkJobListAppliedStaffSearchEntity>((
-          Map<String, dynamic> e) =>
-          UkJobListAppliedStaffSearchEntity.fromJson(e)).toList() as M;
+      return data.map<UkJobListAppliedStaffSearchEntity>((Map<String, dynamic> e) => UkJobListAppliedStaffSearchEntity.fromJson(e)).toList() as M;
     }
     if (<UkJobListAppliedStaffSearchRows>[] is M) {
-      return data.map<UkJobListAppliedStaffSearchRows>((
-          Map<String, dynamic> e) =>
-          UkJobListAppliedStaffSearchRows.fromJson(e)).toList() as M;
+      return data.map<UkJobListAppliedStaffSearchRows>((Map<String, dynamic> e) => UkJobListAppliedStaffSearchRows.fromJson(e)).toList() as M;
     }
     if (<UkJobListAppliedStaffSelectoptionsEntity>[] is M) {
-      return data.map<UkJobListAppliedStaffSelectoptionsEntity>((
-          Map<String, dynamic> e) =>
-          UkJobListAppliedStaffSelectoptionsEntity.fromJson(e)).toList() as M;
+      return data.map<UkJobListAppliedStaffSelectoptionsEntity>((Map<String, dynamic> e) => UkJobListAppliedStaffSelectoptionsEntity.fromJson(e)).toList() as M;
     }
     if (<UkJobListDetailEntity>[] is M) {
-      return data.map<UkJobListDetailEntity>((Map<String, dynamic> e) =>
-          UkJobListDetailEntity.fromJson(e)).toList() as M;
+      return data.map<UkJobListDetailEntity>((Map<String, dynamic> e) => UkJobListDetailEntity.fromJson(e)).toList() as M;
     }
     if (<UkJobListDetailRow>[] is M) {
-      return data.map<UkJobListDetailRow>((Map<String, dynamic> e) =>
-          UkJobListDetailRow.fromJson(e)).toList() as M;
+      return data.map<UkJobListDetailRow>((Map<String, dynamic> e) => UkJobListDetailRow.fromJson(e)).toList() as M;
     }
     if (<UkJobListDetailDepartmentList>[] is M) {
-      return data.map<UkJobListDetailDepartmentList>((Map<String, dynamic> e) =>
-          UkJobListDetailDepartmentList.fromJson(e)).toList() as M;
+      return data.map<UkJobListDetailDepartmentList>((Map<String, dynamic> e) => UkJobListDetailDepartmentList.fromJson(e)).toList() as M;
     }
     if (<UkJobListDetailCertificateList>[] is M) {
-      return data.map<UkJobListDetailCertificateList>((
-          Map<String, dynamic> e) => UkJobListDetailCertificateList.fromJson(e))
-          .toList() as M;
+      return data.map<UkJobListDetailCertificateList>((Map<String, dynamic> e) => UkJobListDetailCertificateList.fromJson(e)).toList() as M;
     }
     if (<UkJobListDetailVehicleList>[] is M) {
-      return data.map<UkJobListDetailVehicleList>((Map<String, dynamic> e) =>
-          UkJobListDetailVehicleList.fromJson(e)).toList() as M;
+      return data.map<UkJobListDetailVehicleList>((Map<String, dynamic> e) => UkJobListDetailVehicleList.fromJson(e)).toList() as M;
     }
     if (<UkJobListDetailChallenge25List>[] is M) {
-      return data.map<UkJobListDetailChallenge25List>((
-          Map<String, dynamic> e) => UkJobListDetailChallenge25List.fromJson(e))
-          .toList() as M;
+      return data.map<UkJobListDetailChallenge25List>((Map<String, dynamic> e) => UkJobListDetailChallenge25List.fromJson(e)).toList() as M;
     }
     if (<UkJobTemplateDetailBySelectTitleEntity>[] is M) {
-      return data.map<UkJobTemplateDetailBySelectTitleEntity>((
-          Map<String, dynamic> e) =>
-          UkJobTemplateDetailBySelectTitleEntity.fromJson(e)).toList() as M;
+      return data.map<UkJobTemplateDetailBySelectTitleEntity>((Map<String, dynamic> e) => UkJobTemplateDetailBySelectTitleEntity.fromJson(e)).toList() as M;
     }
     if (<UkLabReqShowTemplateEntity>[] is M) {
-      return data.map<UkLabReqShowTemplateEntity>((Map<String, dynamic> e) =>
-          UkLabReqShowTemplateEntity.fromJson(e)).toList() as M;
+      return data.map<UkLabReqShowTemplateEntity>((Map<String, dynamic> e) => UkLabReqShowTemplateEntity.fromJson(e)).toList() as M;
     }
     if (<UkLabReqShowTemplateCountryList>[] is M) {
-      return data.map<UkLabReqShowTemplateCountryList>((
-          Map<String, dynamic> e) =>
-          UkLabReqShowTemplateCountryList.fromJson(e)).toList() as M;
+      return data.map<UkLabReqShowTemplateCountryList>((Map<String, dynamic> e) => UkLabReqShowTemplateCountryList.fromJson(e)).toList() as M;
     }
     if (<UkLabReqShowTemplateCityList>[] is M) {
-      return data.map<UkLabReqShowTemplateCityList>((Map<String, dynamic> e) =>
-          UkLabReqShowTemplateCityList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailEntity>[] is M) {
-      return data.map<UkLabourRequestDetailEntity>((Map<String, dynamic> e) =>
-          UkLabourRequestDetailEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailCertificateList>[] is M) {
-      return data.map<UkLabourRequestDetailCertificateList>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailCertificateList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailVehicleList>[] is M) {
-      return data.map<UkLabourRequestDetailVehicleList>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailVehicleList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailChallenge25List>[] is M) {
-      return data.map<UkLabourRequestDetailChallenge25List>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailChallenge25List.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailTemplateList>[] is M) {
-      return data.map<UkLabourRequestDetailTemplateList>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailTemplateList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailDepartmentList>[] is M) {
-      return data.map<UkLabourRequestDetailDepartmentList>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailDepartmentList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailChargeList>[] is M) {
-      return data.map<UkLabourRequestDetailChargeList>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailChargeList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailEmploymentList>[] is M) {
-      return data.map<UkLabourRequestDetailEmploymentList>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailEmploymentList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailCountryList>[] is M) {
-      return data.map<UkLabourRequestDetailCountryList>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestDetailCountryList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestDetailCityList>[] is M) {
-      return data.map<UkLabourRequestDetailCityList>((Map<String, dynamic> e) =>
-          UkLabourRequestDetailCityList.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestPreselectAddstaffListEntity>[] is M) {
-      return data.map<UkLabourRequestPreselectAddstaffListEntity>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestPreselectAddstaffListEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestPreselectAddstaffListRows>[] is M) {
-      return data.map<UkLabourRequestPreselectAddstaffListRows>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestPreselectAddstaffListRows.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestPreselectedListEntity>[] is M) {
-      return data.map<UkLabourRequestPreselectedListEntity>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestPreselectedListEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestPreselectedListRows>[] is M) {
-      return data.map<UkLabourRequestPreselectedListRows>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestPreselectedListRows.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestReviewDetailEntity>[] is M) {
-      return data.map<UkLabourRequestReviewDetailEntity>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestReviewDetailEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestReviewDetailOrder>[] is M) {
-      return data.map<UkLabourRequestReviewDetailOrder>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestReviewDetailOrder.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestReviewDetailOrderRequest>[] is M) {
-      return data.map<UkLabourRequestReviewDetailOrderRequest>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestReviewDetailOrderRequest.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestReviewDetailOrderRecords>[] is M) {
-      return data.map<UkLabourRequestReviewDetailOrderRecords>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestReviewDetailOrderRecords.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestReviewDetailRecords>[] is M) {
-      return data.map<UkLabourRequestReviewDetailRecords>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestReviewDetailRecords.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestReviewListEntity>[] is M) {
-      return data.map<UkLabourRequestReviewListEntity>((
-          Map<String, dynamic> e) =>
-          UkLabourRequestReviewListEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestReviewListRows>[] is M) {
-      return data.map<UkLabourRequestReviewListRows>((Map<String, dynamic> e) =>
-          UkLabourRequestReviewListRows.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestTableEntity>[] is M) {
-      return data.map<UkLabourRequestTableEntity>((Map<String, dynamic> e) =>
-          UkLabourRequestTableEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourRequestTableRows>[] is M) {
-      return data.map<UkLabourRequestTableRows>((Map<String, dynamic> e) =>
-          UkLabourRequestTableRows.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourReviewStatusEntity>[] is M) {
-      return data.map<UkLabourReviewStatusEntity>((Map<String, dynamic> e) =>
-          UkLabourReviewStatusEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourReviewStatusRow>[] is M) {
-      return data.map<UkLabourReviewStatusRow>((Map<String, dynamic> e) =>
-          UkLabourReviewStatusRow.fromJson(e)).toList() as M;
-    }
-    if (<UkLabourReviewStatusRecords>[] is M) {
-      return data.map<UkLabourReviewStatusRecords>((Map<String, dynamic> e) =>
-          UkLabourReviewStatusRecords.fromJson(e)).toList() as M;
-    }
-    if (<UkReportCasualEntity>[] is M) {
-      return data.map<UkReportCasualEntity>((Map<String, dynamic> e) =>
-          UkReportCasualEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkReportCasualRows>[] is M) {
-      return data.map<UkReportCasualRows>((Map<String, dynamic> e) =>
-          UkReportCasualRows.fromJson(e)).toList() as M;
-    }
-    if (<UkReportCasualTotal>[] is M) {
-      return data.map<UkReportCasualTotal>((Map<String, dynamic> e) =>
-          UkReportCasualTotal.fromJson(e)).toList() as M;
-    }
-    if (<UkReportCasualPayEntity>[] is M) {
-      return data.map<UkReportCasualPayEntity>((Map<String, dynamic> e) =>
-          UkReportCasualPayEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkReportCasualPayRows>[] is M) {
-      return data.map<UkReportCasualPayRows>((Map<String, dynamic> e) =>
-          UkReportCasualPayRows.fromJson(e)).toList() as M;
-    }
-    if (<UkReportCasualPayTotal>[] is M) {
-      return data.map<UkReportCasualPayTotal>((Map<String, dynamic> e) =>
-          UkReportCasualPayTotal.fromJson(e)).toList() as M;
-    }
-    if (<UkReportOutletEntity>[] is M) {
-      return data.map<UkReportOutletEntity>((Map<String, dynamic> e) =>
-          UkReportOutletEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkReportOutletRequestList>[] is M) {
-      return data.map<UkReportOutletRequestList>((Map<String, dynamic> e) =>
-          UkReportOutletRequestList.fromJson(e)).toList() as M;
-    }
-    if (<UkStaffDetailEntity>[] is M) {
-      return data.map<UkStaffDetailEntity>((Map<String, dynamic> e) =>
-          UkStaffDetailEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkStaffDetailCertificates>[] is M) {
-      return data.map<UkStaffDetailCertificates>((Map<String, dynamic> e) =>
-          UkStaffDetailCertificates.fromJson(e)).toList() as M;
-    }
-    if (<UkStaffLabourHistoryEntity>[] is M) {
-      return data.map<UkStaffLabourHistoryEntity>((Map<String, dynamic> e) =>
-          UkStaffLabourHistoryEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkStaffLabourHistoryRows>[] is M) {
-      return data.map<UkStaffLabourHistoryRows>((Map<String, dynamic> e) =>
-          UkStaffLabourHistoryRows.fromJson(e)).toList() as M;
-    }
-    if (<UkStaffLabourHistoryRowsSecurityIn>[] is M) {
-      return data.map<UkStaffLabourHistoryRowsSecurityIn>((
-          Map<String, dynamic> e) =>
-          UkStaffLabourHistoryRowsSecurityIn.fromJson(e)).toList() as M;
-    }
-    if (<UkStaffLabourHistoryRowsSecurityOut>[] is M) {
-      return data.map<UkStaffLabourHistoryRowsSecurityOut>((
-          Map<String, dynamic> e) =>
-          UkStaffLabourHistoryRowsSecurityOut.fromJson(e)).toList() as M;
-    }
-    if (<UkStaffLabourHistoryRowsWorkIn>[] is M) {
-      return data.map<UkStaffLabourHistoryRowsWorkIn>((
-          Map<String, dynamic> e) => UkStaffLabourHistoryRowsWorkIn.fromJson(e))
-          .toList() as M;
-    }
-    if (<UkJobAppliedReviseLogRecordsContentReason>[] is M) {
-      return data.map<UkJobAppliedReviseLogRecordsContentReason>((Map<String, dynamic> e) => UkJobAppliedReviseLogRecordsContentReason.fromJson(e))
-          .toList() as M;
-    }
-    if (<UkJobAppliedStaffListEntity>[] is M) {
-      return data.map<UkJobAppliedStaffListEntity>((Map<String, dynamic> e) => UkJobAppliedStaffListEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkJobAppliedStaffListRows>[] is M) {
-      return data.map<UkJobAppliedStaffListRows>((Map<String, dynamic> e) => UkJobAppliedStaffListRows.fromJson(e)).toList() as M;
-    }
-    if (<UkJobAppliedStaffListRowsSecurityIn>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsSecurityIn>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsSecurityIn.fromJson(e)).toList() as M;
-    }
-    if (<UkJobAppliedStaffListRowsSecurityOut>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsSecurityOut>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsSecurityOut.fromJson(e)).toList() as M;
-    }
-    if (<UkJobAppliedStaffListRowsWorkIn>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsWorkIn>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsWorkIn.fromJson(e)).toList() as M;
-    }
-    if (<UkJobAppliedStaffListRowsWorkOut>[] is M) {
-      return data.map<UkJobAppliedStaffListRowsWorkOut>((Map<String, dynamic> e) => UkJobAppliedStaffListRowsWorkOut.fromJson(e)).toList() as M;
-    }
-    if (<UkJobListAppliedStaffSearchEntity>[] is M) {
-      return data.map<UkJobListAppliedStaffSearchEntity>((Map<String, dynamic> e) => UkJobListAppliedStaffSearchEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkJobListAppliedStaffSearchRows>[] is M) {
-      return data.map<UkJobListAppliedStaffSearchRows>((Map<String, dynamic> e) => UkJobListAppliedStaffSearchRows.fromJson(e)).toList() as M;
-    }
-    if (<UkJobTemplateDetailBySelectTitleEntity>[] is M) {
-      return data.map<UkJobTemplateDetailBySelectTitleEntity>((Map<String, dynamic> e) => UkJobTemplateDetailBySelectTitleEntity.fromJson(e)).toList() as M;
-    }
-    if (<UkLabReqShowTemplateEntity>[] is M) {
-      return data.map<UkLabReqShowTemplateEntity>((Map<String, dynamic> e) => UkLabReqShowTemplateEntity.fromJson(e)).toList() as M;
+      return data.map<UkLabReqShowTemplateCityList>((Map<String, dynamic> e) => UkLabReqShowTemplateCityList.fromJson(e)).toList() as M;
     }
     if (<UkLabourRequestDetailEntity>[] is M) {
       return data.map<UkLabourRequestDetailEntity>((Map<String, dynamic> e) => UkLabourRequestDetailEntity.fromJson(e)).toList() as M;
@@ -1324,6 +1073,12 @@ class JsonConvert {
     if (<UkLabourRequestDetailEmploymentList>[] is M) {
       return data.map<UkLabourRequestDetailEmploymentList>((Map<String, dynamic> e) => UkLabourRequestDetailEmploymentList.fromJson(e)).toList() as M;
     }
+    if (<UkLabourRequestDetailCountryList>[] is M) {
+      return data.map<UkLabourRequestDetailCountryList>((Map<String, dynamic> e) => UkLabourRequestDetailCountryList.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestDetailCityList>[] is M) {
+      return data.map<UkLabourRequestDetailCityList>((Map<String, dynamic> e) => UkLabourRequestDetailCityList.fromJson(e)).toList() as M;
+    }
     if (<UkLabourRequestPreselectAddstaffListEntity>[] is M) {
       return data.map<UkLabourRequestPreselectAddstaffListEntity>((Map<String, dynamic> e) => UkLabourRequestPreselectAddstaffListEntity.fromJson(e))
           .toList() as M;
@@ -1428,12 +1183,10 @@ class JsonConvert {
       return data.map<UkTemplateDetailRow>((Map<String, dynamic> e) => UkTemplateDetailRow.fromJson(e)).toList() as M;
     }
     if (<UkTemplateDetailCountryList>[] is M) {
-      return data.map<UkTemplateDetailCountryList>((Map<String, dynamic> e) =>
-          UkTemplateDetailCountryList.fromJson(e)).toList() as M;
+      return data.map<UkTemplateDetailCountryList>((Map<String, dynamic> e) => UkTemplateDetailCountryList.fromJson(e)).toList() as M;
     }
     if (<UkTemplateDetailCityList>[] is M) {
-      return data.map<UkTemplateDetailCityList>((Map<String, dynamic> e) =>
-          UkTemplateDetailCityList.fromJson(e)).toList() as M;
+      return data.map<UkTemplateDetailCityList>((Map<String, dynamic> e) => UkTemplateDetailCityList.fromJson(e)).toList() as M;
     }
     if (<UkTemplateDetailTitleList>[] is M) {
       return data.map<UkTemplateDetailTitleList>((Map<String, dynamic> e) => UkTemplateDetailTitleList.fromJson(e)).toList() as M;
@@ -1451,9 +1204,7 @@ class JsonConvert {
       return data.map<UkTemplateDetailIndexEntity>((Map<String, dynamic> e) => UkTemplateDetailIndexEntity.fromJson(e)).toList() as M;
     }
     if (<UkTemplateDetailIndexCountryList>[] is M) {
-      return data.map<UkTemplateDetailIndexCountryList>((
-          Map<String, dynamic> e) =>
-          UkTemplateDetailIndexCountryList.fromJson(e)).toList() as M;
+      return data.map<UkTemplateDetailIndexCountryList>((Map<String, dynamic> e) => UkTemplateDetailIndexCountryList.fromJson(e)).toList() as M;
     }
     if (<UkTemplateDetailIndexCertificateList>[] is M) {
       return data.map<UkTemplateDetailIndexCertificateList>((Map<String, dynamic> e) => UkTemplateDetailIndexCertificateList.fromJson(e)).toList() as M;
@@ -1737,82 +1488,45 @@ class JsonConvertClassCollection {
     (UkJobAppliedReviseLogRecordsContentReason).toString(): UkJobAppliedReviseLogRecordsContentReason.fromJson,
     (UkJobAppliedStaffListEntity).toString(): UkJobAppliedStaffListEntity.fromJson,
     (UkJobAppliedStaffListRows).toString(): UkJobAppliedStaffListRows.fromJson,
-    (UkJobAppliedStaffListRowsSecurityIn)
-        .toString(): UkJobAppliedStaffListRowsSecurityIn.fromJson,
-    (UkJobAppliedStaffListRowsSecurityOut)
-        .toString(): UkJobAppliedStaffListRowsSecurityOut.fromJson,
-    (UkJobAppliedStaffListRowsWorkIn)
-        .toString(): UkJobAppliedStaffListRowsWorkIn.fromJson,
-    (UkJobAppliedStaffListRowsWorkOut)
-        .toString(): UkJobAppliedStaffListRowsWorkOut.fromJson,
-    (UkJobListAppliedStaffSearchEntity)
-        .toString(): UkJobListAppliedStaffSearchEntity.fromJson,
-    (UkJobListAppliedStaffSearchRows)
-        .toString(): UkJobListAppliedStaffSearchRows.fromJson,
-    (UkJobListAppliedStaffSelectoptionsEntity)
-        .toString(): UkJobListAppliedStaffSelectoptionsEntity.fromJson,
+    (UkJobAppliedStaffListRowsSecurityIn).toString(): UkJobAppliedStaffListRowsSecurityIn.fromJson,
+    (UkJobAppliedStaffListRowsSecurityOut).toString(): UkJobAppliedStaffListRowsSecurityOut.fromJson,
+    (UkJobAppliedStaffListRowsWorkIn).toString(): UkJobAppliedStaffListRowsWorkIn.fromJson,
+    (UkJobAppliedStaffListRowsWorkOut).toString(): UkJobAppliedStaffListRowsWorkOut.fromJson,
+    (UkJobListAppliedStaffSearchEntity).toString(): UkJobListAppliedStaffSearchEntity.fromJson,
+    (UkJobListAppliedStaffSearchRows).toString(): UkJobListAppliedStaffSearchRows.fromJson,
+    (UkJobListAppliedStaffSelectoptionsEntity).toString(): UkJobListAppliedStaffSelectoptionsEntity.fromJson,
     (UkJobListDetailEntity).toString(): UkJobListDetailEntity.fromJson,
     (UkJobListDetailRow).toString(): UkJobListDetailRow.fromJson,
-    (UkJobListDetailDepartmentList).toString(): UkJobListDetailDepartmentList
-        .fromJson,
-    (UkJobListDetailCertificateList).toString(): UkJobListDetailCertificateList
-        .fromJson,
-    (UkJobListDetailVehicleList).toString(): UkJobListDetailVehicleList
-        .fromJson,
-    (UkJobListDetailChallenge25List).toString(): UkJobListDetailChallenge25List
-        .fromJson,
-    (UkJobTemplateDetailBySelectTitleEntity)
-        .toString(): UkJobTemplateDetailBySelectTitleEntity.fromJson,
-    (UkLabReqShowTemplateEntity).toString(): UkLabReqShowTemplateEntity
-        .fromJson,
-    (UkLabReqShowTemplateCountryList)
-        .toString(): UkLabReqShowTemplateCountryList.fromJson,
-    (UkLabReqShowTemplateCityList).toString(): UkLabReqShowTemplateCityList
-        .fromJson,
-    (UkLabourRequestDetailEntity).toString(): UkLabourRequestDetailEntity
-        .fromJson,
-    (UkLabourRequestDetailCertificateList)
-        .toString(): UkLabourRequestDetailCertificateList.fromJson,
-    (UkLabourRequestDetailVehicleList)
-        .toString(): UkLabourRequestDetailVehicleList.fromJson,
-    (UkLabourRequestDetailChallenge25List)
-        .toString(): UkLabourRequestDetailChallenge25List.fromJson,
-    (UkLabourRequestDetailTemplateList)
-        .toString(): UkLabourRequestDetailTemplateList.fromJson,
-    (UkLabourRequestDetailDepartmentList)
-        .toString(): UkLabourRequestDetailDepartmentList.fromJson,
-    (UkLabourRequestDetailChargeList)
-        .toString(): UkLabourRequestDetailChargeList.fromJson,
-    (UkLabourRequestDetailEmploymentList)
-        .toString(): UkLabourRequestDetailEmploymentList.fromJson,
-    (UkLabourRequestDetailCountryList)
-        .toString(): UkLabourRequestDetailCountryList.fromJson,
-    (UkLabourRequestDetailCityList).toString(): UkLabourRequestDetailCityList
-        .fromJson,
-    (UkLabourRequestPreselectAddstaffListEntity)
-        .toString(): UkLabourRequestPreselectAddstaffListEntity.fromJson,
-    (UkLabourRequestPreselectAddstaffListRows)
-        .toString(): UkLabourRequestPreselectAddstaffListRows.fromJson,
-    (UkLabourRequestPreselectedListEntity)
-        .toString(): UkLabourRequestPreselectedListEntity.fromJson,
-    (UkLabourRequestPreselectedListRows)
-        .toString(): UkLabourRequestPreselectedListRows.fromJson,
-    (UkLabourRequestReviewDetailEntity)
-        .toString(): UkLabourRequestReviewDetailEntity.fromJson,
-    (UkLabourRequestReviewDetailOrder)
-        .toString(): UkLabourRequestReviewDetailOrder.fromJson,
-    (UkLabourRequestReviewDetailOrderRequest)
-        .toString(): UkLabourRequestReviewDetailOrderRequest.fromJson,
-    (UkLabourRequestReviewDetailOrderRecords)
-        .toString(): UkLabourRequestReviewDetailOrderRecords.fromJson,
-    (UkLabourRequestReviewDetailRecords)
-        .toString(): UkLabourRequestReviewDetailRecords.fromJson,
-    (UkLabourRequestReviewListEntity)
-        .toString(): UkLabourRequestReviewListEntity.fromJson,
-    (UkLabourRequestReviewListRows).toString(): UkLabourRequestReviewListRows
-        .fromJson,
-    (UkLabourRequestTableEntity).toString(): UkLabourRequestTableEntity
-        .fromJson,
+    (UkJobListDetailDepartmentList).toString(): UkJobListDetailDepartmentList.fromJson,
+    (UkJobListDetailCertificateList).toString(): UkJobListDetailCertificateList.fromJson,
+    (UkJobListDetailVehicleList).toString(): UkJobListDetailVehicleList.fromJson,
+    (UkJobListDetailChallenge25List).toString(): UkJobListDetailChallenge25List.fromJson,
+    (UkJobTemplateDetailBySelectTitleEntity).toString(): UkJobTemplateDetailBySelectTitleEntity.fromJson,
+    (UkLabReqShowTemplateEntity).toString(): UkLabReqShowTemplateEntity.fromJson,
+    (UkLabReqShowTemplateCountryList).toString(): UkLabReqShowTemplateCountryList.fromJson,
+    (UkLabReqShowTemplateCityList).toString(): UkLabReqShowTemplateCityList.fromJson,
+    (UkLabourRequestDetailEntity).toString(): UkLabourRequestDetailEntity.fromJson,
+    (UkLabourRequestDetailCertificateList).toString(): UkLabourRequestDetailCertificateList.fromJson,
+    (UkLabourRequestDetailVehicleList).toString(): UkLabourRequestDetailVehicleList.fromJson,
+    (UkLabourRequestDetailChallenge25List).toString(): UkLabourRequestDetailChallenge25List.fromJson,
+    (UkLabourRequestDetailTemplateList).toString(): UkLabourRequestDetailTemplateList.fromJson,
+    (UkLabourRequestDetailDepartmentList).toString(): UkLabourRequestDetailDepartmentList.fromJson,
+    (UkLabourRequestDetailChargeList).toString(): UkLabourRequestDetailChargeList.fromJson,
+    (UkLabourRequestDetailEmploymentList).toString(): UkLabourRequestDetailEmploymentList.fromJson,
+    (UkLabourRequestDetailCountryList).toString(): UkLabourRequestDetailCountryList.fromJson,
+    (UkLabourRequestDetailCityList).toString(): UkLabourRequestDetailCityList.fromJson,
+    (UkLabourRequestPreselectAddstaffListEntity).toString(): UkLabourRequestPreselectAddstaffListEntity.fromJson,
+    (UkLabourRequestPreselectAddstaffListRows).toString(): UkLabourRequestPreselectAddstaffListRows.fromJson,
+    (UkLabourRequestPreselectedListEntity).toString(): UkLabourRequestPreselectedListEntity.fromJson,
+    (UkLabourRequestPreselectedListRows).toString(): UkLabourRequestPreselectedListRows.fromJson,
+    (UkLabourRequestReviewDetailEntity).toString(): UkLabourRequestReviewDetailEntity.fromJson,
+    (UkLabourRequestReviewDetailOrder).toString(): UkLabourRequestReviewDetailOrder.fromJson,
+    (UkLabourRequestReviewDetailOrderRequest).toString(): UkLabourRequestReviewDetailOrderRequest.fromJson,
+    (UkLabourRequestReviewDetailOrderRecords).toString(): UkLabourRequestReviewDetailOrderRecords.fromJson,
+    (UkLabourRequestReviewDetailRecords).toString(): UkLabourRequestReviewDetailRecords.fromJson,
+    (UkLabourRequestReviewListEntity).toString(): UkLabourRequestReviewListEntity.fromJson,
+    (UkLabourRequestReviewListRows).toString(): UkLabourRequestReviewListRows.fromJson,
+    (UkLabourRequestTableEntity).toString(): UkLabourRequestTableEntity.fromJson,
     (UkLabourRequestTableRows).toString(): UkLabourRequestTableRows.fromJson,
     (UkLabourReviewStatusEntity).toString(): UkLabourReviewStatusEntity.fromJson,
     (UkLabourReviewStatusRow).toString(): UkLabourReviewStatusRow.fromJson,
@@ -1835,36 +1549,17 @@ class JsonConvertClassCollection {
     (UkStaffLabourHistoryRowsWorkOut).toString(): UkStaffLabourHistoryRowsWorkOut.fromJson,
     (UkTemplateDetailEntity).toString(): UkTemplateDetailEntity.fromJson,
     (UkTemplateDetailRow).toString(): UkTemplateDetailRow.fromJson,
-    (UkTemplateDetailCountryList).toString(): UkTemplateDetailCountryList
-        .fromJson,
+    (UkTemplateDetailCountryList).toString(): UkTemplateDetailCountryList.fromJson,
     (UkTemplateDetailCityList).toString(): UkTemplateDetailCityList.fromJson,
     (UkTemplateDetailTitleList).toString(): UkTemplateDetailTitleList.fromJson,
-<<<<<<< HEAD
     (UkTemplateDetailCertificateList).toString(): UkTemplateDetailCertificateList.fromJson,
     (UkTemplateDetailVehicleList).toString(): UkTemplateDetailVehicleList.fromJson,
     (UkTemplateDetailChallenge25List).toString(): UkTemplateDetailChallenge25List.fromJson,
     (UkTemplateDetailIndexEntity).toString(): UkTemplateDetailIndexEntity.fromJson,
+    (UkTemplateDetailIndexCountryList).toString(): UkTemplateDetailIndexCountryList.fromJson,
     (UkTemplateDetailIndexCertificateList).toString(): UkTemplateDetailIndexCertificateList.fromJson,
     (UkTemplateDetailIndexVehicleList).toString(): UkTemplateDetailIndexVehicleList.fromJson,
     (UkTemplateDetailIndexChallenge25List).toString(): UkTemplateDetailIndexChallenge25List.fromJson,
-=======
-    (UkTemplateDetailCertificateList)
-        .toString(): UkTemplateDetailCertificateList.fromJson,
-    (UkTemplateDetailVehicleList).toString(): UkTemplateDetailVehicleList
-        .fromJson,
-    (UkTemplateDetailChallenge25List)
-        .toString(): UkTemplateDetailChallenge25List.fromJson,
-    (UkTemplateDetailIndexEntity).toString(): UkTemplateDetailIndexEntity
-        .fromJson,
-    (UkTemplateDetailIndexCountryList)
-        .toString(): UkTemplateDetailIndexCountryList.fromJson,
-    (UkTemplateDetailIndexCertificateList)
-        .toString(): UkTemplateDetailIndexCertificateList.fromJson,
-    (UkTemplateDetailIndexVehicleList)
-        .toString(): UkTemplateDetailIndexVehicleList.fromJson,
-    (UkTemplateDetailIndexChallenge25List)
-        .toString(): UkTemplateDetailIndexChallenge25List.fromJson,
->>>>>>> master-ukk
     (UkTemplateTableEntity).toString(): UkTemplateTableEntity.fromJson,
     (UkTemplateTableRows).toString(): UkTemplateTableRows.fromJson,
     (UkTemplateTitleOptionEntity).toString(): UkTemplateTitleOptionEntity.fromJson,

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

@@ -1,157 +1,3 @@
-<<<<<<< HEAD
-import 'package:domain/generated/json/base/json_convert_content.dart';
-import 'package:domain/entity/response/hotel_info_entity.dart';
-
-HotelInfoEntity $HotelInfoEntityFromJson(Map<String, dynamic> json) {
-  final HotelInfoEntity hotelInfoEntity = HotelInfoEntity();
-  final int? adminId = jsonConvert.convert<int>(json['admin_id']);
-  if (adminId != null) {
-    hotelInfoEntity.adminId = adminId;
-  }
-  final String? name = jsonConvert.convert<String>(json['name']);
-  if (name != null) {
-    hotelInfoEntity.name = name;
-  }
-  final int? hotelId = jsonConvert.convert<int>(json['hotel_id']);
-  if (hotelId != null) {
-    hotelInfoEntity.hotelId = hotelId;
-  }
-  final String? hotelName = jsonConvert.convert<String>(json['hotel_name']);
-  if (hotelName != null) {
-    hotelInfoEntity.hotelName = hotelName;
-  }
-  final List<HotelInfoMenus>? menus = (json['menus'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HotelInfoMenus>(e) as HotelInfoMenus).toList();
-  if (menus != null) {
-    hotelInfoEntity.menus = menus;
-  }
-  final String? token = jsonConvert.convert<String>(json['token']);
-  if (token != null) {
-    hotelInfoEntity.token = token;
-  }
-  return hotelInfoEntity;
-}
-
-Map<String, dynamic> $HotelInfoEntityToJson(HotelInfoEntity entity) {
-  final Map<String, dynamic> data = <String, dynamic>{};
-  data['admin_id'] = entity.adminId;
-  data['name'] = entity.name;
-  data['hotel_id'] = entity.hotelId;
-  data['hotel_name'] = entity.hotelName;
-  data['menus'] = entity.menus?.map((v) => v.toJson()).toList();
-  data['token'] = entity.token;
-  return data;
-}
-
-extension HotelInfoEntityExtension on HotelInfoEntity {
-  HotelInfoEntity copyWith({
-    int? adminId,
-    String? name,
-    int? hotelId,
-    String? hotelName,
-    List<HotelInfoMenus>? menus,
-    String? token,
-  }) {
-    return HotelInfoEntity()
-      ..adminId = adminId ?? this.adminId
-      ..name = name ?? this.name
-      ..hotelId = hotelId ?? this.hotelId
-      ..hotelName = hotelName ?? this.hotelName
-      ..menus = menus ?? this.menus
-      ..token = token ?? this.token;
-  }
-}
-
-HotelInfoMenus $HotelInfoMenusFromJson(Map<String, dynamic> json) {
-  final HotelInfoMenus hotelInfoMenus = HotelInfoMenus();
-  final String? key = jsonConvert.convert<String>(json['key']);
-  if (key != null) {
-    hotelInfoMenus.key = key;
-  }
-  final String? name = jsonConvert.convert<String>(json['name']);
-  if (name != null) {
-    hotelInfoMenus.name = name;
-  }
-  final String? route = jsonConvert.convert<String>(json['route']);
-  if (route != null) {
-    hotelInfoMenus.route = route;
-  }
-  final String? redDot = jsonConvert.convert<String>(json['red_dot']);
-  if (redDot != null) {
-    hotelInfoMenus.redDot = redDot;
-  }
-  final bool? own = jsonConvert.convert<bool>(json['own']);
-  if (own != null) {
-    hotelInfoMenus.own = own;
-  }
-  final List<HotelInfoMenusChildren>? children = (json['children'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HotelInfoMenusChildren>(e) as HotelInfoMenusChildren).toList();
-  if (children != null) {
-    hotelInfoMenus.children = children;
-  }
-  return hotelInfoMenus;
-}
-
-Map<String, dynamic> $HotelInfoMenusToJson(HotelInfoMenus entity) {
-  final Map<String, dynamic> data = <String, dynamic>{};
-  data['key'] = entity.key;
-  data['name'] = entity.name;
-  data['route'] = entity.route;
-  data['red_dot'] = entity.redDot;
-  data['own'] = entity.own;
-  data['children'] = entity.children?.map((v) => v.toJson()).toList();
-  return data;
-}
-
-extension HotelInfoMenusExtension on HotelInfoMenus {
-  HotelInfoMenus copyWith({
-    String? key,
-    String? name,
-    String? route,
-    String? redDot,
-    bool? own,
-    List<HotelInfoMenusChildren>? children,
-  }) {
-    return HotelInfoMenus()
-      ..key = key ?? this.key
-      ..name = name ?? this.name
-      ..route = route ?? this.route
-      ..redDot = redDot ?? this.redDot
-      ..own = own ?? this.own
-      ..children = children ?? this.children;
-  }
-}
-
-HotelInfoMenusChildren $HotelInfoMenusChildrenFromJson(Map<String, dynamic> json) {
-  final HotelInfoMenusChildren hotelInfoMenusChildren = HotelInfoMenusChildren();
-  final String? key = jsonConvert.convert<String>(json['key']);
-  if (key != null) {
-    hotelInfoMenusChildren.key = key;
-  }
-  final String? name = jsonConvert.convert<String>(json['name']);
-  if (name != null) {
-    hotelInfoMenusChildren.name = name;
-  }
-  return hotelInfoMenusChildren;
-}
-
-Map<String, dynamic> $HotelInfoMenusChildrenToJson(HotelInfoMenusChildren entity) {
-  final Map<String, dynamic> data = <String, dynamic>{};
-  data['key'] = entity.key;
-  data['name'] = entity.name;
-  return data;
-}
-
-extension HotelInfoMenusChildrenExtension on HotelInfoMenusChildren {
-  HotelInfoMenusChildren copyWith({
-    String? key,
-    String? name,
-  }) {
-    return HotelInfoMenusChildren()
-      ..key = key ?? this.key
-      ..name = name ?? this.name;
-  }
-=======
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/response/hotel_info_entity.dart';
 
@@ -177,15 +23,12 @@ HotelInfoEntity $HotelInfoEntityFromJson(Map<String, dynamic> json) {
   if (cvShow != null) {
     hotelInfoEntity.cvShow = cvShow;
   }
-  final int? mobileNumberShow = jsonConvert.convert<int>(
-      json['mobile_number_show']);
+  final int? mobileNumberShow = jsonConvert.convert<int>(json['mobile_number_show']);
   if (mobileNumberShow != null) {
     hotelInfoEntity.mobileNumberShow = mobileNumberShow;
   }
-  final List<HotelInfoMenus>? menus = (json['menus'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<HotelInfoMenus>(e) as HotelInfoMenus)
-      .toList();
+  final List<HotelInfoMenus>? menus = (json['menus'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HotelInfoMenus>(e) as HotelInfoMenus).toList();
   if (menus != null) {
     hotelInfoEntity.menus = menus;
   }
@@ -254,12 +97,8 @@ HotelInfoMenus $HotelInfoMenusFromJson(Map<String, dynamic> json) {
   if (own != null) {
     hotelInfoMenus.own = own;
   }
-  final List<HotelInfoMenusChildren>? children = (json['children'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<HotelInfoMenusChildren>(e) as HotelInfoMenusChildren)
-      .toList();
+  final List<HotelInfoMenusChildren>? children = (json['children'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HotelInfoMenusChildren>(e) as HotelInfoMenusChildren).toList();
   if (children != null) {
     hotelInfoMenus.children = children;
   }
@@ -296,8 +135,7 @@ extension HotelInfoMenusExtension on HotelInfoMenus {
   }
 }
 
-HotelInfoMenusChildren $HotelInfoMenusChildrenFromJson(
-    Map<String, dynamic> json) {
+HotelInfoMenusChildren $HotelInfoMenusChildrenFromJson(Map<String, dynamic> json) {
   final HotelInfoMenusChildren hotelInfoMenusChildren = HotelInfoMenusChildren();
   final String? key = jsonConvert.convert<String>(json['key']);
   if (key != null) {
@@ -310,8 +148,7 @@ HotelInfoMenusChildren $HotelInfoMenusChildrenFromJson(
   return hotelInfoMenusChildren;
 }
 
-Map<String, dynamic> $HotelInfoMenusChildrenToJson(
-    HotelInfoMenusChildren entity) {
+Map<String, dynamic> $HotelInfoMenusChildrenToJson(HotelInfoMenusChildren entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['key'] = entity.key;
   data['name'] = entity.name;
@@ -327,5 +164,4 @@ extension HotelInfoMenusChildrenExtension on HotelInfoMenusChildren {
       ..key = key ?? this.key
       ..name = name ?? this.name;
   }
->>>>>>> master-ukk
 }

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

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/response/uk_job_list_applied_staff_selectoptions_entity.dart';
 
-UkJobListAppliedStaffSelectoptionsEntity $UkJobListAppliedStaffSelectoptionsEntityFromJson(
-    Map<String, dynamic> json) {
+UkJobListAppliedStaffSelectoptionsEntity $UkJobListAppliedStaffSelectoptionsEntityFromJson(Map<String, dynamic> json) {
   final UkJobListAppliedStaffSelectoptionsEntity ukJobListAppliedStaffSelectoptionsEntity = UkJobListAppliedStaffSelectoptionsEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -15,8 +14,7 @@ UkJobListAppliedStaffSelectoptionsEntity $UkJobListAppliedStaffSelectoptionsEnti
   return ukJobListAppliedStaffSelectoptionsEntity;
 }
 
-Map<String, dynamic> $UkJobListAppliedStaffSelectoptionsEntityToJson(
-    UkJobListAppliedStaffSelectoptionsEntity entity) {
+Map<String, dynamic> $UkJobListAppliedStaffSelectoptionsEntityToJson(UkJobListAppliedStaffSelectoptionsEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

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

@@ -1,11 +1,9 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/response/uk_job_list_detail_entity.dart';
 
-UkJobListDetailEntity $UkJobListDetailEntityFromJson(
-    Map<String, dynamic> json) {
+UkJobListDetailEntity $UkJobListDetailEntityFromJson(Map<String, dynamic> json) {
   final UkJobListDetailEntity ukJobListDetailEntity = UkJobListDetailEntity();
-  final UkJobListDetailRow? row = jsonConvert.convert<UkJobListDetailRow>(
-      json['row']);
+  final UkJobListDetailRow? row = jsonConvert.convert<UkJobListDetailRow>(json['row']);
   if (row != null) {
     ukJobListDetailEntity.row = row;
   }
@@ -33,47 +31,30 @@ UkJobListDetailEntity $UkJobListDetailEntityFromJson(
   if (endTime != null) {
     ukJobListDetailEntity.endTime = endTime;
   }
-  final List<
-      UkJobListDetailDepartmentList>? departmentList = (json['department_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkJobListDetailDepartmentList>(
-          e) as UkJobListDetailDepartmentList).toList();
+  final List<UkJobListDetailDepartmentList>? departmentList = (json['department_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkJobListDetailDepartmentList>(e) as UkJobListDetailDepartmentList).toList();
   if (departmentList != null) {
     ukJobListDetailEntity.departmentList = departmentList;
   }
-  final List<
-      UkJobListDetailCertificateList>? certificateList = (json['certificate_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkJobListDetailCertificateList>(
-          e) as UkJobListDetailCertificateList).toList();
+  final List<UkJobListDetailCertificateList>? certificateList = (json['certificate_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkJobListDetailCertificateList>(e) as UkJobListDetailCertificateList).toList();
   if (certificateList != null) {
     ukJobListDetailEntity.certificateList = certificateList;
   }
-  final List<
-      UkJobListDetailVehicleList>? vehicleList = (json['vehicle_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkJobListDetailVehicleList>(
-          e) as UkJobListDetailVehicleList).toList();
+  final List<UkJobListDetailVehicleList>? vehicleList = (json['vehicle_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkJobListDetailVehicleList>(e) as UkJobListDetailVehicleList).toList();
   if (vehicleList != null) {
     ukJobListDetailEntity.vehicleList = vehicleList;
   }
-  final List<
-      UkJobListDetailChallenge25List>? challenge25List = (json['challenge_25_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkJobListDetailChallenge25List>(
-          e) as UkJobListDetailChallenge25List).toList();
+  final List<UkJobListDetailChallenge25List>? challenge25List = (json['challenge_25_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkJobListDetailChallenge25List>(e) as UkJobListDetailChallenge25List).toList();
   if (challenge25List != null) {
     ukJobListDetailEntity.challenge25List = challenge25List;
   }
   return ukJobListDetailEntity;
 }
 
-Map<String, dynamic> $UkJobListDetailEntityToJson(
-    UkJobListDetailEntity entity) {
+Map<String, dynamic> $UkJobListDetailEntityToJson(UkJobListDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['row'] = entity.row?.toJson();
   data['job_id'] = entity.jobId;
@@ -82,13 +63,10 @@ Map<String, dynamic> $UkJobListDetailEntityToJson(
   data['department_id'] = entity.departmentId;
   data['start_time'] = entity.startTime;
   data['end_time'] = entity.endTime;
-  data['department_list'] =
-      entity.departmentList?.map((v) => v.toJson()).toList();
-  data['certificate_list'] =
-      entity.certificateList?.map((v) => v.toJson()).toList();
+  data['department_list'] = entity.departmentList?.map((v) => v.toJson()).toList();
+  data['certificate_list'] = entity.certificateList?.map((v) => v.toJson()).toList();
   data['vehicle_list'] = entity.vehicleList?.map((v) => v.toJson()).toList();
-  data['challenge_25_list'] =
-      entity.challenge25List?.map((v) => v.toJson()).toList();
+  data['challenge_25_list'] = entity.challenge25List?.map((v) => v.toJson()).toList();
   return data;
 }
 
@@ -127,33 +105,27 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (jobId != null) {
     ukJobListDetailRow.jobId = jobId;
   }
-  final int? jobPublishAdminId = jsonConvert.convert<int>(
-      json['job_publish_admin_id']);
+  final int? jobPublishAdminId = jsonConvert.convert<int>(json['job_publish_admin_id']);
   if (jobPublishAdminId != null) {
     ukJobListDetailRow.jobPublishAdminId = jobPublishAdminId;
   }
-  final String? jobPublishAdminRole = jsonConvert.convert<String>(
-      json['job_publish_admin_role']);
+  final String? jobPublishAdminRole = jsonConvert.convert<String>(json['job_publish_admin_role']);
   if (jobPublishAdminRole != null) {
     ukJobListDetailRow.jobPublishAdminRole = jobPublishAdminRole;
   }
-  final int? jobEmployerAdminId = jsonConvert.convert<int>(
-      json['job_employer_admin_id']);
+  final int? jobEmployerAdminId = jsonConvert.convert<int>(json['job_employer_admin_id']);
   if (jobEmployerAdminId != null) {
     ukJobListDetailRow.jobEmployerAdminId = jobEmployerAdminId;
   }
-  final String? jobEmployerCompanyName = jsonConvert.convert<String>(
-      json['job_employer_company_name']);
+  final String? jobEmployerCompanyName = jsonConvert.convert<String>(json['job_employer_company_name']);
   if (jobEmployerCompanyName != null) {
     ukJobListDetailRow.jobEmployerCompanyName = jobEmployerCompanyName;
   }
-  final int? jobRecruiterAdminId = jsonConvert.convert<int>(
-      json['job_recruiter_admin_id']);
+  final int? jobRecruiterAdminId = jsonConvert.convert<int>(json['job_recruiter_admin_id']);
   if (jobRecruiterAdminId != null) {
     ukJobListDetailRow.jobRecruiterAdminId = jobRecruiterAdminId;
   }
-  final String? jobRecruiterAdminName = jsonConvert.convert<String>(
-      json['job_recruiter_admin_name']);
+  final String? jobRecruiterAdminName = jsonConvert.convert<String>(json['job_recruiter_admin_name']);
   if (jobRecruiterAdminName != null) {
     ukJobListDetailRow.jobRecruiterAdminName = jobRecruiterAdminName;
   }
@@ -165,8 +137,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (jobTitleId != null) {
     ukJobListDetailRow.jobTitleId = jobTitleId;
   }
-  final String? jobDescription = jsonConvert.convert<String>(
-      json['job_description']);
+  final String? jobDescription = jsonConvert.convert<String>(json['job_description']);
   if (jobDescription != null) {
     ukJobListDetailRow.jobDescription = jobDescription;
   }
@@ -190,23 +161,19 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (jobAreaMainId != null) {
     ukJobListDetailRow.jobAreaMainId = jobAreaMainId;
   }
-  final int? jobAreaChildId = jsonConvert.convert<int>(
-      json['job_area_child_id']);
+  final int? jobAreaChildId = jsonConvert.convert<int>(json['job_area_child_id']);
   if (jobAreaChildId != null) {
     ukJobListDetailRow.jobAreaChildId = jobAreaChildId;
   }
-  final int? jobNeedPeopleCount = jsonConvert.convert<int>(
-      json['job_need_people_count']);
+  final int? jobNeedPeopleCount = jsonConvert.convert<int>(json['job_need_people_count']);
   if (jobNeedPeopleCount != null) {
     ukJobListDetailRow.jobNeedPeopleCount = jobNeedPeopleCount;
   }
-  final String? jobContactName = jsonConvert.convert<String>(
-      json['job_contact_name']);
+  final String? jobContactName = jsonConvert.convert<String>(json['job_contact_name']);
   if (jobContactName != null) {
     ukJobListDetailRow.jobContactName = jobContactName;
   }
-  final String? jobContactNo = jsonConvert.convert<String>(
-      json['job_contact_no']);
+  final String? jobContactNo = jsonConvert.convert<String>(json['job_contact_no']);
   if (jobContactNo != null) {
     ukJobListDetailRow.jobContactNo = jobContactNo;
   }
@@ -242,8 +209,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (jobIndustryId != null) {
     ukJobListDetailRow.jobIndustryId = jobIndustryId;
   }
-  final String? jobIndustryName = jsonConvert.convert<String>(
-      json['job_industry_name']);
+  final String? jobIndustryName = jsonConvert.convert<String>(json['job_industry_name']);
   if (jobIndustryName != null) {
     ukJobListDetailRow.jobIndustryName = jobIndustryName;
   }
@@ -251,18 +217,15 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (jobPeopleSex != null) {
     ukJobListDetailRow.jobPeopleSex = jobPeopleSex;
   }
-  final String? jobPeopleLanguage = jsonConvert.convert<String>(
-      json['job_people_language']);
+  final String? jobPeopleLanguage = jsonConvert.convert<String>(json['job_people_language']);
   if (jobPeopleLanguage != null) {
     ukJobListDetailRow.jobPeopleLanguage = jobPeopleLanguage;
   }
-  final String? jobPeopleNationality = jsonConvert.convert<String>(
-      json['job_people_nationality']);
+  final String? jobPeopleNationality = jsonConvert.convert<String>(json['job_people_nationality']);
   if (jobPeopleNationality != null) {
     ukJobListDetailRow.jobPeopleNationality = jobPeopleNationality;
   }
-  final String? jobPeopleAge = jsonConvert.convert<String>(
-      json['job_people_age']);
+  final String? jobPeopleAge = jsonConvert.convert<String>(json['job_people_age']);
   if (jobPeopleAge != null) {
     ukJobListDetailRow.jobPeopleAge = jobPeopleAge;
   }
@@ -270,18 +233,15 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (jobLatitude != null) {
     ukJobListDetailRow.jobLatitude = jobLatitude;
   }
-  final String? jobLongitude = jsonConvert.convert<String>(
-      json['job_longitude']);
+  final String? jobLongitude = jsonConvert.convert<String>(json['job_longitude']);
   if (jobLongitude != null) {
     ukJobListDetailRow.jobLongitude = jobLongitude;
   }
-  final String? jobRequirements = jsonConvert.convert<String>(
-      json['job_requirements']);
+  final String? jobRequirements = jsonConvert.convert<String>(json['job_requirements']);
   if (jobRequirements != null) {
     ukJobListDetailRow.jobRequirements = jobRequirements;
   }
-  final String? jobGeolocation = jsonConvert.convert<String>(
-      json['job_geolocation']);
+  final String? jobGeolocation = jsonConvert.convert<String>(json['job_geolocation']);
   if (jobGeolocation != null) {
     ukJobListDetailRow.jobGeolocation = jobGeolocation;
   }
@@ -301,8 +261,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (recipientId != null) {
     ukJobListDetailRow.recipientId = recipientId;
   }
-  final int? exportSchedulesPdf = jsonConvert.convert<int>(
-      json['export_schedules_pdf']);
+  final int? exportSchedulesPdf = jsonConvert.convert<int>(json['export_schedules_pdf']);
   if (exportSchedulesPdf != null) {
     ukJobListDetailRow.exportSchedulesPdf = exportSchedulesPdf;
   }
@@ -310,8 +269,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (employerStatus != null) {
     ukJobListDetailRow.employerStatus = employerStatus;
   }
-  final String? confirmSignature = jsonConvert.convert<String>(
-      json['confirm_signature']);
+  final String? confirmSignature = jsonConvert.convert<String>(json['confirm_signature']);
   if (confirmSignature != null) {
     ukJobListDetailRow.confirmSignature = confirmSignature;
   }
@@ -323,8 +281,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (employementStatus != null) {
     ukJobListDetailRow.employementStatus = employementStatus;
   }
-  final int? foodCertificateRequired = jsonConvert.convert<int>(
-      json['food_certificate_required']);
+  final int? foodCertificateRequired = jsonConvert.convert<int>(json['food_certificate_required']);
   if (foodCertificateRequired != null) {
     ukJobListDetailRow.foodCertificateRequired = foodCertificateRequired;
   }
@@ -344,8 +301,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (toppingAt != null) {
     ukJobListDetailRow.toppingAt = toppingAt;
   }
-  final int? jobIsNotifyThree = jsonConvert.convert<int>(
-      json['job_is_notify_three']);
+  final int? jobIsNotifyThree = jsonConvert.convert<int>(json['job_is_notify_three']);
   if (jobIsNotifyThree != null) {
     ukJobListDetailRow.jobIsNotifyThree = jobIsNotifyThree;
   }
@@ -389,13 +345,11 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (jobUnit != null) {
     ukJobListDetailRow.jobUnit = jobUnit;
   }
-  final int? coDepartmentId = jsonConvert.convert<int>(
-      json['co_department_id']);
+  final int? coDepartmentId = jsonConvert.convert<int>(json['co_department_id']);
   if (coDepartmentId != null) {
     ukJobListDetailRow.coDepartmentId = coDepartmentId;
   }
-  final int? jobInstantStatus = jsonConvert.convert<int>(
-      json['job_instant_status']);
+  final int? jobInstantStatus = jsonConvert.convert<int>(json['job_instant_status']);
   if (jobInstantStatus != null) {
     ukJobListDetailRow.jobInstantStatus = jobInstantStatus;
   }
@@ -407,8 +361,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (agencyRate != null) {
     ukJobListDetailRow.agencyRate = agencyRate;
   }
-  final String? jobCertificate = jsonConvert.convert<String>(
-      json['job_certificate']);
+  final String? jobCertificate = jsonConvert.convert<String>(json['job_certificate']);
   if (jobCertificate != null) {
     ukJobListDetailRow.jobCertificate = jobCertificate;
   }
@@ -420,8 +373,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (challenge25 != null) {
     ukJobListDetailRow.challenge25 = challenge25;
   }
-  final int? toppingAdminId = jsonConvert.convert<int>(
-      json['topping_admin_id']);
+  final int? toppingAdminId = jsonConvert.convert<int>(json['topping_admin_id']);
   if (toppingAdminId != null) {
     ukJobListDetailRow.toppingAdminId = toppingAdminId;
   }
@@ -461,8 +413,7 @@ UkJobListDetailRow $UkJobListDetailRowFromJson(Map<String, dynamic> json) {
   if (otherImage != null) {
     ukJobListDetailRow.otherImage = otherImage;
   }
-  final String? otherDocument = jsonConvert.convert<String>(
-      json['other_document']);
+  final String? otherDocument = jsonConvert.convert<String>(json['other_document']);
   if (otherDocument != null) {
     ukJobListDetailRow.otherDocument = otherDocument;
   }
@@ -646,11 +597,9 @@ extension UkJobListDetailRowExtension on UkJobListDetailRow {
       ..jobPublishAdminId = jobPublishAdminId ?? this.jobPublishAdminId
       ..jobPublishAdminRole = jobPublishAdminRole ?? this.jobPublishAdminRole
       ..jobEmployerAdminId = jobEmployerAdminId ?? this.jobEmployerAdminId
-      ..jobEmployerCompanyName = jobEmployerCompanyName ??
-          this.jobEmployerCompanyName
+      ..jobEmployerCompanyName = jobEmployerCompanyName ?? this.jobEmployerCompanyName
       ..jobRecruiterAdminId = jobRecruiterAdminId ?? this.jobRecruiterAdminId
-      ..jobRecruiterAdminName = jobRecruiterAdminName ??
-          this.jobRecruiterAdminName
+      ..jobRecruiterAdminName = jobRecruiterAdminName ?? this.jobRecruiterAdminName
       ..jobTitle = jobTitle ?? this.jobTitle
       ..jobTitleId = jobTitleId ?? this.jobTitleId
       ..jobDescription = jobDescription ?? this.jobDescription
@@ -689,8 +638,7 @@ extension UkJobListDetailRowExtension on UkJobListDetailRow {
       ..confirmSignature = confirmSignature ?? this.confirmSignature
       ..confirmTime = confirmTime ?? this.confirmTime
       ..employementStatus = employementStatus ?? this.employementStatus
-      ..foodCertificateRequired = foodCertificateRequired ??
-          this.foodCertificateRequired
+      ..foodCertificateRequired = foodCertificateRequired ?? this.foodCertificateRequired
       ..rsaCertificate = rsaCertificate ?? this.rsaCertificate
       ..foodHandler = foodHandler ?? this.foodHandler
       ..topping = topping ?? this.topping
@@ -728,8 +676,7 @@ extension UkJobListDetailRowExtension on UkJobListDetailRow {
   }
 }
 
-UkJobListDetailDepartmentList $UkJobListDetailDepartmentListFromJson(
-    Map<String, dynamic> json) {
+UkJobListDetailDepartmentList $UkJobListDetailDepartmentListFromJson(Map<String, dynamic> json) {
   final UkJobListDetailDepartmentList ukJobListDetailDepartmentList = UkJobListDetailDepartmentList();
   final int? value = jsonConvert.convert<int>(json['value']);
   if (value != null) {
@@ -746,8 +693,7 @@ UkJobListDetailDepartmentList $UkJobListDetailDepartmentListFromJson(
   return ukJobListDetailDepartmentList;
 }
 
-Map<String, dynamic> $UkJobListDetailDepartmentListToJson(
-    UkJobListDetailDepartmentList entity) {
+Map<String, dynamic> $UkJobListDetailDepartmentListToJson(UkJobListDetailDepartmentList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['value'] = entity.value;
   data['txt'] = entity.txt;
@@ -768,8 +714,7 @@ extension UkJobListDetailDepartmentListExtension on UkJobListDetailDepartmentLis
   }
 }
 
-UkJobListDetailCertificateList $UkJobListDetailCertificateListFromJson(
-    Map<String, dynamic> json) {
+UkJobListDetailCertificateList $UkJobListDetailCertificateListFromJson(Map<String, dynamic> json) {
   final UkJobListDetailCertificateList ukJobListDetailCertificateList = UkJobListDetailCertificateList();
   final int? value = jsonConvert.convert<int>(json['value']);
   if (value != null) {
@@ -786,8 +731,7 @@ UkJobListDetailCertificateList $UkJobListDetailCertificateListFromJson(
   return ukJobListDetailCertificateList;
 }
 
-Map<String, dynamic> $UkJobListDetailCertificateListToJson(
-    UkJobListDetailCertificateList entity) {
+Map<String, dynamic> $UkJobListDetailCertificateListToJson(UkJobListDetailCertificateList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['value'] = entity.value;
   data['txt'] = entity.txt;
@@ -808,8 +752,7 @@ extension UkJobListDetailCertificateListExtension on UkJobListDetailCertificateL
   }
 }
 
-UkJobListDetailVehicleList $UkJobListDetailVehicleListFromJson(
-    Map<String, dynamic> json) {
+UkJobListDetailVehicleList $UkJobListDetailVehicleListFromJson(Map<String, dynamic> json) {
   final UkJobListDetailVehicleList ukJobListDetailVehicleList = UkJobListDetailVehicleList();
   final String? value = jsonConvert.convert<String>(json['value']);
   if (value != null) {
@@ -826,8 +769,7 @@ UkJobListDetailVehicleList $UkJobListDetailVehicleListFromJson(
   return ukJobListDetailVehicleList;
 }
 
-Map<String, dynamic> $UkJobListDetailVehicleListToJson(
-    UkJobListDetailVehicleList entity) {
+Map<String, dynamic> $UkJobListDetailVehicleListToJson(UkJobListDetailVehicleList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['value'] = entity.value;
   data['txt'] = entity.txt;
@@ -848,8 +790,7 @@ extension UkJobListDetailVehicleListExtension on UkJobListDetailVehicleList {
   }
 }
 
-UkJobListDetailChallenge25List $UkJobListDetailChallenge25ListFromJson(
-    Map<String, dynamic> json) {
+UkJobListDetailChallenge25List $UkJobListDetailChallenge25ListFromJson(Map<String, dynamic> json) {
   final UkJobListDetailChallenge25List ukJobListDetailChallenge25List = UkJobListDetailChallenge25List();
   final int? value = jsonConvert.convert<int>(json['value']);
   if (value != null) {
@@ -866,8 +807,7 @@ UkJobListDetailChallenge25List $UkJobListDetailChallenge25ListFromJson(
   return ukJobListDetailChallenge25List;
 }
 
-Map<String, dynamic> $UkJobListDetailChallenge25ListToJson(
-    UkJobListDetailChallenge25List entity) {
+Map<String, dynamic> $UkJobListDetailChallenge25ListToJson(UkJobListDetailChallenge25List entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['value'] = entity.value;
   data['txt'] = entity.txt;

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

@@ -19,8 +19,7 @@ UkLabReqShowTemplateEntity $UkLabReqShowTemplateEntityFromJson(Map<String, dynam
   if (contactName != null) {
     ukLabReqShowTemplateEntity.contactName = contactName;
   }
-  final int? contactCountryCode = jsonConvert.convert<int>(
-      json['contact_country_code']);
+  final int? contactCountryCode = jsonConvert.convert<int>(json['contact_country_code']);
   if (contactCountryCode != null) {
     ukLabReqShowTemplateEntity.contactCountryCode = contactCountryCode;
   }
@@ -100,21 +99,13 @@ UkLabReqShowTemplateEntity $UkLabReqShowTemplateEntityFromJson(Map<String, dynam
   if (location != null) {
     ukLabReqShowTemplateEntity.location = location;
   }
-  final List<
-      UkLabReqShowTemplateCountryList>? countryList = (json['country_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkLabReqShowTemplateCountryList>(
-          e) as UkLabReqShowTemplateCountryList).toList();
+  final List<UkLabReqShowTemplateCountryList>? countryList = (json['country_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkLabReqShowTemplateCountryList>(e) as UkLabReqShowTemplateCountryList).toList();
   if (countryList != null) {
     ukLabReqShowTemplateEntity.countryList = countryList;
   }
-  final List<
-      UkLabReqShowTemplateCityList>? cityList = (json['city_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkLabReqShowTemplateCityList>(
-          e) as UkLabReqShowTemplateCityList).toList();
+  final List<UkLabReqShowTemplateCityList>? cityList = (json['city_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkLabReqShowTemplateCityList>(e) as UkLabReqShowTemplateCityList).toList();
   if (cityList != null) {
     ukLabReqShowTemplateEntity.cityList = cityList;
   }
@@ -211,8 +202,7 @@ extension UkLabReqShowTemplateEntityExtension on UkLabReqShowTemplateEntity {
   }
 }
 
-UkLabReqShowTemplateCountryList $UkLabReqShowTemplateCountryListFromJson(
-    Map<String, dynamic> json) {
+UkLabReqShowTemplateCountryList $UkLabReqShowTemplateCountryListFromJson(Map<String, dynamic> json) {
   final UkLabReqShowTemplateCountryList ukLabReqShowTemplateCountryList = UkLabReqShowTemplateCountryList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -225,8 +215,7 @@ UkLabReqShowTemplateCountryList $UkLabReqShowTemplateCountryListFromJson(
   return ukLabReqShowTemplateCountryList;
 }
 
-Map<String, dynamic> $UkLabReqShowTemplateCountryListToJson(
-    UkLabReqShowTemplateCountryList entity) {
+Map<String, dynamic> $UkLabReqShowTemplateCountryListToJson(UkLabReqShowTemplateCountryList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -244,8 +233,7 @@ extension UkLabReqShowTemplateCountryListExtension on UkLabReqShowTemplateCountr
   }
 }
 
-UkLabReqShowTemplateCityList $UkLabReqShowTemplateCityListFromJson(
-    Map<String, dynamic> json) {
+UkLabReqShowTemplateCityList $UkLabReqShowTemplateCityListFromJson(Map<String, dynamic> json) {
   final UkLabReqShowTemplateCityList ukLabReqShowTemplateCityList = UkLabReqShowTemplateCityList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -258,8 +246,7 @@ UkLabReqShowTemplateCityList $UkLabReqShowTemplateCityListFromJson(
   return ukLabReqShowTemplateCityList;
 }
 
-Map<String, dynamic> $UkLabReqShowTemplateCityListToJson(
-    UkLabReqShowTemplateCityList entity) {
+Map<String, dynamic> $UkLabReqShowTemplateCityListToJson(UkLabReqShowTemplateCityList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

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

@@ -122,12 +122,8 @@ UkLabourRequestDetailEntity $UkLabourRequestDetailEntityFromJson(Map<String, dyn
   if (challenge25List != null) {
     ukLabourRequestDetailEntity.challenge25List = challenge25List;
   }
-  final List<
-      UkLabourRequestDetailTemplateList>? templateList = (json['template_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkLabourRequestDetailTemplateList>(
-          e) as UkLabourRequestDetailTemplateList).toList();
+  final List<UkLabourRequestDetailTemplateList>? templateList = (json['template_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkLabourRequestDetailTemplateList>(e) as UkLabourRequestDetailTemplateList).toList();
   if (templateList != null) {
     ukLabourRequestDetailEntity.templateList = templateList;
   }
@@ -146,21 +142,13 @@ UkLabourRequestDetailEntity $UkLabourRequestDetailEntityFromJson(Map<String, dyn
   if (employmentList != null) {
     ukLabourRequestDetailEntity.employmentList = employmentList;
   }
-  final List<
-      UkLabourRequestDetailCountryList>? countryList = (json['country_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkLabourRequestDetailCountryList>(
-          e) as UkLabourRequestDetailCountryList).toList();
+  final List<UkLabourRequestDetailCountryList>? countryList = (json['country_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkLabourRequestDetailCountryList>(e) as UkLabourRequestDetailCountryList).toList();
   if (countryList != null) {
     ukLabourRequestDetailEntity.countryList = countryList;
   }
-  final List<
-      UkLabourRequestDetailCityList>? cityList = (json['city_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkLabourRequestDetailCityList>(
-          e) as UkLabourRequestDetailCityList).toList();
+  final List<UkLabourRequestDetailCityList>? cityList = (json['city_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkLabourRequestDetailCityList>(e) as UkLabourRequestDetailCityList).toList();
   if (cityList != null) {
     ukLabourRequestDetailEntity.cityList = cityList;
   }
@@ -197,19 +185,13 @@ Map<String, dynamic> $UkLabourRequestDetailEntityToJson(UkLabourRequestDetailEnt
   data['other_document'] = entity.otherDocument;
   data['certificate_list'] = entity.certificateList?.map((v) => v.toJson()).toList();
   data['vehicle_list'] = entity.vehicleList?.map((v) => v.toJson()).toList();
-  data['challenge_25_list'] =
-      entity.challenge25List?.map((v) => v.toJson()).toList();
+  data['challenge_25_list'] = entity.challenge25List?.map((v) => v.toJson()).toList();
   data['template_list'] = entity.templateList?.map((v) => v.toJson()).toList();
   data['department_list'] = entity.departmentList?.map((v) => v.toJson()).toList();
   data['charge_list'] = entity.chargeList?.map((v) => v.toJson()).toList();
-<<<<<<< HEAD
   data['employment_list'] = entity.employmentList?.map((v) => v.toJson()).toList();
-=======
-  data['employment_list'] =
-      entity.employmentList?.map((v) => v.toJson()).toList();
   data['country_list'] = entity.countryList?.map((v) => v.toJson()).toList();
   data['city_list'] = entity.cityList?.map((v) => v.toJson()).toList();
->>>>>>> master-ukk
   return data;
 }
 
@@ -404,8 +386,7 @@ extension UkLabourRequestDetailChallenge25ListExtension on UkLabourRequestDetail
   }
 }
 
-UkLabourRequestDetailTemplateList $UkLabourRequestDetailTemplateListFromJson(
-    Map<String, dynamic> json) {
+UkLabourRequestDetailTemplateList $UkLabourRequestDetailTemplateListFromJson(Map<String, dynamic> json) {
   final UkLabourRequestDetailTemplateList ukLabourRequestDetailTemplateList = UkLabourRequestDetailTemplateList();
   final int? value = jsonConvert.convert<int>(json['value']);
   if (value != null) {
@@ -557,8 +538,7 @@ extension UkLabourRequestDetailEmploymentListExtension on UkLabourRequestDetailE
   }
 }
 
-UkLabourRequestDetailCountryList $UkLabourRequestDetailCountryListFromJson(
-    Map<String, dynamic> json) {
+UkLabourRequestDetailCountryList $UkLabourRequestDetailCountryListFromJson(Map<String, dynamic> json) {
   final UkLabourRequestDetailCountryList ukLabourRequestDetailCountryList = UkLabourRequestDetailCountryList();
   final int? value = jsonConvert.convert<int>(json['value']);
   if (value != null) {
@@ -575,8 +555,7 @@ UkLabourRequestDetailCountryList $UkLabourRequestDetailCountryListFromJson(
   return ukLabourRequestDetailCountryList;
 }
 
-Map<String, dynamic> $UkLabourRequestDetailCountryListToJson(
-    UkLabourRequestDetailCountryList entity) {
+Map<String, dynamic> $UkLabourRequestDetailCountryListToJson(UkLabourRequestDetailCountryList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['value'] = entity.value;
   data['txt'] = entity.txt;
@@ -597,8 +576,7 @@ extension UkLabourRequestDetailCountryListExtension on UkLabourRequestDetailCoun
   }
 }
 
-UkLabourRequestDetailCityList $UkLabourRequestDetailCityListFromJson(
-    Map<String, dynamic> json) {
+UkLabourRequestDetailCityList $UkLabourRequestDetailCityListFromJson(Map<String, dynamic> json) {
   final UkLabourRequestDetailCityList ukLabourRequestDetailCityList = UkLabourRequestDetailCityList();
   final int? value = jsonConvert.convert<int>(json['value']);
   if (value != null) {
@@ -615,8 +593,7 @@ UkLabourRequestDetailCityList $UkLabourRequestDetailCityListFromJson(
   return ukLabourRequestDetailCityList;
 }
 
-Map<String, dynamic> $UkLabourRequestDetailCityListToJson(
-    UkLabourRequestDetailCityList entity) {
+Map<String, dynamic> $UkLabourRequestDetailCityListToJson(UkLabourRequestDetailCityList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['value'] = entity.value;
   data['txt'] = entity.txt;

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

@@ -55,16 +55,11 @@ UkLabourRequestPreselectAddstaffListRows $UkLabourRequestPreselectAddstaffListRo
   if (nric != null) {
     ukLabourRequestPreselectAddstaffListRows.nric = nric;
   }
-<<<<<<< HEAD
-  final String? profilePicture = jsonConvert.convert<String>(json['profile_picture']);
-=======
   final String? phone = jsonConvert.convert<String>(json['phone']);
   if (phone != null) {
     ukLabourRequestPreselectAddstaffListRows.phone = phone;
   }
-  final String? profilePicture = jsonConvert.convert<String>(
-      json['profile_picture']);
->>>>>>> master-ukk
+  final String? profilePicture = jsonConvert.convert<String>(json['profile_picture']);
   if (profilePicture != null) {
     ukLabourRequestPreselectAddstaffListRows.profilePicture = profilePicture;
   }

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

@@ -69,19 +69,13 @@ UkStaffDetailEntity $UkStaffDetailEntityFromJson(Map<String, dynamic> json) {
   if (challenge25 != null) {
     ukStaffDetailEntity.challenge25 = challenge25;
   }
-  final List<String>? certtypeList = (json['certtype_list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<String>(e) as String)
-      .toList();
+  final List<String>? certtypeList = (json['certtype_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<String>(e) as String).toList();
   if (certtypeList != null) {
     ukStaffDetailEntity.certtypeList = certtypeList;
   }
-  final List<
-      UkStaffDetailCertificates>? certificates = (json['certificates'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkStaffDetailCertificates>(
-          e) as UkStaffDetailCertificates).toList();
+  final List<UkStaffDetailCertificates>? certificates = (json['certificates'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkStaffDetailCertificates>(e) as UkStaffDetailCertificates).toList();
   if (certificates != null) {
     ukStaffDetailEntity.certificates = certificates;
   }

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

@@ -7,25 +7,17 @@ UkTemplateDetailEntity $UkTemplateDetailEntityFromJson(Map<String, dynamic> json
   if (row != null) {
     ukTemplateDetailEntity.row = row;
   }
-  final String? withoutCountryContactNo = jsonConvert.convert<String>(
-      json['without_country_contact_no']);
+  final String? withoutCountryContactNo = jsonConvert.convert<String>(json['without_country_contact_no']);
   if (withoutCountryContactNo != null) {
     ukTemplateDetailEntity.withoutCountryContactNo = withoutCountryContactNo;
   }
-  final List<
-      UkTemplateDetailCountryList>? countryList = (json['country_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkTemplateDetailCountryList>(
-          e) as UkTemplateDetailCountryList).toList();
+  final List<UkTemplateDetailCountryList>? countryList = (json['country_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkTemplateDetailCountryList>(e) as UkTemplateDetailCountryList).toList();
   if (countryList != null) {
     ukTemplateDetailEntity.countryList = countryList;
   }
-  final List<UkTemplateDetailCityList>? cityList = (json['city_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkTemplateDetailCityList>(
-          e) as UkTemplateDetailCityList).toList();
+  final List<UkTemplateDetailCityList>? cityList = (json['city_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkTemplateDetailCityList>(e) as UkTemplateDetailCityList).toList();
   if (cityList != null) {
     ukTemplateDetailEntity.cityList = cityList;
   }
@@ -97,8 +89,7 @@ extension UkTemplateDetailEntityExtension on UkTemplateDetailEntity {
   }) {
     return UkTemplateDetailEntity()
       ..row = row ?? this.row
-      ..withoutCountryContactNo = withoutCountryContactNo ??
-          this.withoutCountryContactNo
+      ..withoutCountryContactNo = withoutCountryContactNo ?? this.withoutCountryContactNo
       ..countryList = countryList ?? this.countryList
       ..cityList = cityList ?? this.cityList
       ..jobTemplateId = jobTemplateId ?? this.jobTemplateId
@@ -129,8 +120,7 @@ UkTemplateDetailRow $UkTemplateDetailRowFromJson(Map<String, dynamic> json) {
   if (contactName != null) {
     ukTemplateDetailRow.contactName = contactName;
   }
-  final int? contactCountryCode = jsonConvert.convert<int>(
-      json['contact_country_code']);
+  final int? contactCountryCode = jsonConvert.convert<int>(json['contact_country_code']);
   if (contactCountryCode != null) {
     ukTemplateDetailRow.contactCountryCode = contactCountryCode;
   }
@@ -297,8 +287,7 @@ extension UkTemplateDetailRowExtension on UkTemplateDetailRow {
   }
 }
 
-UkTemplateDetailCountryList $UkTemplateDetailCountryListFromJson(
-    Map<String, dynamic> json) {
+UkTemplateDetailCountryList $UkTemplateDetailCountryListFromJson(Map<String, dynamic> json) {
   final UkTemplateDetailCountryList ukTemplateDetailCountryList = UkTemplateDetailCountryList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -311,8 +300,7 @@ UkTemplateDetailCountryList $UkTemplateDetailCountryListFromJson(
   return ukTemplateDetailCountryList;
 }
 
-Map<String, dynamic> $UkTemplateDetailCountryListToJson(
-    UkTemplateDetailCountryList entity) {
+Map<String, dynamic> $UkTemplateDetailCountryListToJson(UkTemplateDetailCountryList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -330,8 +318,7 @@ extension UkTemplateDetailCountryListExtension on UkTemplateDetailCountryList {
   }
 }
 
-UkTemplateDetailCityList $UkTemplateDetailCityListFromJson(
-    Map<String, dynamic> json) {
+UkTemplateDetailCityList $UkTemplateDetailCityListFromJson(Map<String, dynamic> json) {
   final UkTemplateDetailCityList ukTemplateDetailCityList = UkTemplateDetailCityList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -344,8 +331,7 @@ UkTemplateDetailCityList $UkTemplateDetailCityListFromJson(
   return ukTemplateDetailCityList;
 }
 
-Map<String, dynamic> $UkTemplateDetailCityListToJson(
-    UkTemplateDetailCityList entity) {
+Map<String, dynamic> $UkTemplateDetailCityListToJson(UkTemplateDetailCityList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

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

@@ -8,26 +8,13 @@ UkTemplateDetailIndexEntity $UkTemplateDetailIndexEntityFromJson(Map<String, dyn
   if (templateList != null) {
     ukTemplateDetailIndexEntity.templateList = templateList;
   }
-<<<<<<< HEAD
-  final List<UkTemplateDetailIndexCertificateList>? certificateList = (json['certificate_list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<UkTemplateDetailIndexCertificateList>(e) as UkTemplateDetailIndexCertificateList).toList();
-=======
-  final List<
-      UkTemplateDetailIndexCountryList>? countryList = (json['country_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkTemplateDetailIndexCountryList>(
-          e) as UkTemplateDetailIndexCountryList).toList();
+  final List<UkTemplateDetailIndexCountryList>? countryList = (json['country_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkTemplateDetailIndexCountryList>(e) as UkTemplateDetailIndexCountryList).toList();
   if (countryList != null) {
     ukTemplateDetailIndexEntity.countryList = countryList;
   }
-  final List<
-      UkTemplateDetailIndexCertificateList>? certificateList = (json['certificate_list'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<UkTemplateDetailIndexCertificateList>(
-          e) as UkTemplateDetailIndexCertificateList).toList();
->>>>>>> master-ukk
+  final List<UkTemplateDetailIndexCertificateList>? certificateList = (json['certificate_list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UkTemplateDetailIndexCertificateList>(e) as UkTemplateDetailIndexCertificateList).toList();
   if (certificateList != null) {
     ukTemplateDetailIndexEntity.certificateList = certificateList;
   }
@@ -47,13 +34,8 @@ UkTemplateDetailIndexEntity $UkTemplateDetailIndexEntityFromJson(Map<String, dyn
 Map<String, dynamic> $UkTemplateDetailIndexEntityToJson(UkTemplateDetailIndexEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['template_list'] = entity.templateList;
-<<<<<<< HEAD
-  data['certificate_list'] = entity.certificateList?.map((v) => v.toJson()).toList();
-=======
   data['country_list'] = entity.countryList?.map((v) => v.toJson()).toList();
-  data['certificate_list'] =
-      entity.certificateList?.map((v) => v.toJson()).toList();
->>>>>>> master-ukk
+  data['certificate_list'] = entity.certificateList?.map((v) => v.toJson()).toList();
   data['vehicle_list'] = entity.vehicleList?.map((v) => v.toJson()).toList();
   data['challenge_25_list'] = entity.challenge25List?.map((v) => v.toJson()).toList();
   return data;
@@ -76,11 +58,7 @@ extension UkTemplateDetailIndexEntityExtension on UkTemplateDetailIndexEntity {
   }
 }
 
-<<<<<<< HEAD
-UkTemplateDetailIndexCertificateList $UkTemplateDetailIndexCertificateListFromJson(Map<String, dynamic> json) {
-=======
-UkTemplateDetailIndexCountryList $UkTemplateDetailIndexCountryListFromJson(
-    Map<String, dynamic> json) {
+UkTemplateDetailIndexCountryList $UkTemplateDetailIndexCountryListFromJson(Map<String, dynamic> json) {
   final UkTemplateDetailIndexCountryList ukTemplateDetailIndexCountryList = UkTemplateDetailIndexCountryList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -93,8 +71,7 @@ UkTemplateDetailIndexCountryList $UkTemplateDetailIndexCountryListFromJson(
   return ukTemplateDetailIndexCountryList;
 }
 
-Map<String, dynamic> $UkTemplateDetailIndexCountryListToJson(
-    UkTemplateDetailIndexCountryList entity) {
+Map<String, dynamic> $UkTemplateDetailIndexCountryListToJson(UkTemplateDetailIndexCountryList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -112,9 +89,7 @@ extension UkTemplateDetailIndexCountryListExtension on UkTemplateDetailIndexCoun
   }
 }
 
-UkTemplateDetailIndexCertificateList $UkTemplateDetailIndexCertificateListFromJson(
-    Map<String, dynamic> json) {
->>>>>>> master-ukk
+UkTemplateDetailIndexCertificateList $UkTemplateDetailIndexCertificateListFromJson(Map<String, dynamic> json) {
   final UkTemplateDetailIndexCertificateList ukTemplateDetailIndexCertificateList = UkTemplateDetailIndexCertificateList();
   final int? value = jsonConvert.convert<int>(json['value']);
   if (value != null) {