update

@@ -9,32 +9,18 @@ declare module 'vue' {
   export interface GlobalComponents {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElCard: typeof import('element-plus/es')['ElCard']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
     Header: typeof import('./src/components/layout/Header.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Sidebar: typeof import('./src/components/layout/Sidebar.vue')['default']
     SidebarItem: typeof import('./src/components/layout/SidebarItem.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

@@ -244,13 +244,8 @@
                   </tr>
                 </thead>
                 <tbody>
-<<<<<<< .mine
-                  <tr v-for="item in deliveryDetail.deliveryItems" :key="item.deliveryItemId">
-                    <td>{{ item.productName }}</td>
-=======
                   <tr v-for="item in deliveryDetail.deliveryItems" :key="item.itemId || item.deliveryId">
-
->>>>>>> .theirs
+                    <td>{{ item.productName }}</td>
                     <td>{{ item.productCode }}</td>
                     <td>{{ item.deliveryQty }}</td>
                     <td>{{ formatCurrency(item.deliveryPrice) }}</td>