Merge branch 'dev' into dev_g

src/views/Layout/src/components/Header/components/NotificationDrawer.vue

@@ -13,7 +13,6 @@ const notificationTypeList = ref({
   all: 'All Notifications',
   Milestone_Update: 'Milestone Update',
   Container_Status_Update: 'Container Status Update',
-  Container_Arrival: 'Container Arrival',
   'Departure/Arrival_Delay': 'Departure/Arrival Delay',
   'ETD/ETA_Change': 'ETD/ETA Change',
   Feature_Update: 'Feature Update'

src/views/SystemMessage/src/SystemMessage.vue

@@ -38,7 +38,6 @@ const navList = [
 const notificationTypeList = ref({
   Milestone_Update: 'Milestone Update',
   Container_Status_Update: 'Container Status Update',
-  Container_Arrival: 'Container Arrival',
   'Departure/Arrival_Delay': 'Departure/Arrival Delay',
   'ETD/ETA_Change': 'ETD/ETA Change',
   Feature_Update: 'Feature Update'