合并冲突

spring

2025-02-26 d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289

 src/components/caorui/Department/components/Plan/index.vue

@@ -215,8 +215,8 @@
                    label: '备注',
                    prop: 'remarks'
                }, {
                    label: '培训日期',
                    prop: 'trainDate'
                    label: '监督项目',
                    prop: 'superviseProject'
                }, {
                    label: '创建',
                    prop: 'createBy'