From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突

---
 src/views/basic/workstation/workstation-form.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 7ffc2aa..4d3d990 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -171,7 +171,7 @@
           >
           </el-transfer>
         </el-tab-pane> -->
-        <el-tab-pane label="鎴愬搧寰呮搴撲綅" name="product">
+        <el-tab-pane label="浜у搧寰呮搴撲綅" name="product">
           <el-transfer
             filterable
             v-model="productInspectionLocationIds"

--
Gitblit v1.9.3