From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码
---
src/views/procurementManagement/arrivalManagement/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/procurementManagement/arrivalManagement/index.vue b/src/views/procurementManagement/arrivalManagement/index.vue
index b5f1ce4..0143538 100644
--- a/src/views/procurementManagement/arrivalManagement/index.vue
+++ b/src/views/procurementManagement/arrivalManagement/index.vue
@@ -95,7 +95,7 @@
supplierName: '渚涘簲鍟咥',
status: 'received',
arrivalQuantity: 250,
- arrivalTime: '2024-12-01 15:30:00',
+ arrivalTime: '2025-12-01 15:30:00',
remark: '姝ｅ父鍒拌揣'
}
]
--
Gitblit v1.9.3