From 8049ae0a3c7ea0cf8e3fe0b4adf32f98439b8591 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 16 Jan 2026 14:48:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
index 49bb872..a31d43e 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
@@ -16,7 +16,7 @@
 					<el-form-item label="报废时间" prop="scrapTime">
 						<el-date-picker class="ztzf-data-cockpit-date-picker" popper-class="ztzf-data-cockpit-date-picker-popper"
 							v-model="formData.scrapTime"
-							type="date"
+							type="datetime"
 							placeholder="选择日期"
 							value-format="YYYY-MM-DD HH:mm:ss"
 							clearable

--
Gitblit v1.9.3