From b4f08a561973b998036f6ffa9e843cfd5ee877be Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 03 Jun 2026 14:35:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue b/applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue
index 32de314..2afc377 100644
--- a/applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue
@@ -48,7 +48,7 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="结果送达方式" prop="resultConfig">
+					<el-form-item label="结果配置" prop="resultConfig">
 						<el-select
 							class="gd-select"
 							popper-class="gd-select-popper"

--
Gitblit v1.9.3