From 4683c8a19e593e8f999c6f1a145e0bb73eb20dea Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:12 +0800
Subject: [PATCH] 解决冲突

---
 Web/src/views/device/wcsOderTask/component/editDialog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Web/src/views/device/wcsOderTask/component/editDialog.vue b/Web/src/views/device/wcsOderTask/component/editDialog.vue
index d0d0468..652ccb2 100644
--- a/Web/src/views/device/wcsOderTask/component/editDialog.vue
+++ b/Web/src/views/device/wcsOderTask/component/editDialog.vue
@@ -115,7 +115,7 @@
 			</template>
 		</el-dialog>
 
-		<!-- 缁戝畾浠诲姟寮规 -->
+		<!-- 閫夋嫨鐗╂枡寮规 -->
 		<el-dialog v-model="bindDialogVisible" title="閫夋嫨鏁版嵁">
             <el-table
                 :data="bindBoxData" 

--
Gitblit v1.8.0