Resolve rebase conflicts

Author: kyle1morel

frontend/tests/unit/components/authorization/AuthorizationCard.spec.ts

@@ -55,6 +55,7 @@ const testPermit: Permit = {
   updatedBy: 'testUpdatedAt',
   updatedAt: currentDate,
   permitType: testPermitType,
+  permitTypeId: testPermitType.permitTypeId,
   permitNote: [],
   permitTracking: []
 };

frontend/tests/unit/components/authorization/AuthorizationCardLite.spec.ts

@@ -56,6 +56,7 @@ const testPermit: Permit = {
   updatedBy: 'testUpdatedAt',
   updatedAt: currentDate,
   permitType: testPermitType,
+  permitTypeId: testPermitType.permitTypeId,
   permitNote: [],
   permitTracking: []
 };

frontend/tests/unit/components/common/Breadcrumb.spec.ts

@@ -124,6 +124,7 @@ const testPermit: Permit = {
   updatedBy: 'testUpdatedAt',
   updatedAt: currentDate,
   permitType: testPermitType,
+  permitTypeId: testPermitType.permitTypeId,
   permitNote: [],
   permitTracking: []
 };

frontend/tests/unit/service/permitService.spec.ts

@@ -36,6 +36,7 @@ const TEST_PERMIT_1: Permit = {
   submittedDate: new Date().toISOString(),
   adjudicationDate: new Date().toISOString(),
   permitType: TEST_PERMIT_TYPE,
+  permitTypeId: TEST_PERMIT_TYPE.permitTypeId,
   permitNote: [],
   permitTracking: []
 };