Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/views/plan/autoTest/components/tree.vue

frontend/src/views/plan/planList/index.vue

@@ -317,7 +317,7 @@ function handleFiles(event: Event) {
   const files = target.files
   if (files && files.length > 0) {
     // 处理文件
-    console.log(files)
+   // console.log(files)
     ElMessageBox.confirm(
         '导入的数据与当前数据有冲突，请选择以哪个数据为主进行覆盖',
         '数据冲突',
@@ -366,7 +366,7 @@ const combineClick = () => {
       },
   )
       .then(({ value }) => {
-        console.log(`合并后的计划名为:`, value)
+       // console.log(`合并后的计划名为:`, value)
         proTable.value?.clearSelection()
         proTable.value?.getTableList()
       })