From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/basic/workstation/workstation-form.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 4d3d990..16509cd 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -182,7 +182,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜哄伐妯℃澘" name="handyman">
+ <!-- <el-tab-pane label="浜哄伐妯℃澘" name="handyman">
<el-transfer
filterable
v-model="handymanTypeIds"
@@ -193,7 +193,7 @@
@change="handleChangeHandyman"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-row>
<span slot="footer" class="dialog-footer">
--
Gitblit v1.9.3