From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/caorui/Department/components/Records/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/components/caorui/Department/components/Records/index.vue b/src/components/caorui/Department/components/Records/index.vue
index ac322e3..84b89f1 100644
--- a/src/components/caorui/Department/components/Records/index.vue
+++ b/src/components/caorui/Department/components/Records/index.vue
@@ -114,10 +114,11 @@
searchVal: undefined
},
superviseColumnData: [
+ // {
+ // label: 'id',
+ // prop: 'id'
+ // },
{
- label: 'id',
- prop: 'id'
- }, {
label: '妫�娴嬩汉鍛�',
prop: 'testerName',
width: 120
--
Gitblit v1.9.3