修改冲突

licp

2024-12-26 b7eedb41516a6ab02526e64177331a9669f4d3cb

 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