Merge remote-tracking branch 'origin/main' into main

src/views/system/log/businessLog/index.vue

@@ -26,7 +26,7 @@
         <el-select v-model="listQuery.result" placeholder="请选择事件结果" style="width: 200px" class="filter-item ml-20">
             <el-option v-for="item in Object.keys(outcomeList)" :key="item" :value="outcomeList[item]" :label="outcomeList[item]" />
         </el-select>
-        <el-select v-model="listQuery.operateType" placeholder="请选择操作类型" style="width: 200px" class="filter-item ml-20">
+        <el-select v-model="listQuery.operType" placeholder="请选择操作类型" style="width: 200px" class="filter-item ml-20">
             <el-option v-for="item in Object.keys(operateList)" :key="item" :value="operateList[item]" :label="operateList[item]" />
         </el-select>
 
@@ -135,7 +135,7 @@
           content:'',
           result: '',
           operTime:'',
-          operateType: '',
+          operType: '',
           logSort:1,
           logDesc:1,
         },
@@ -192,7 +192,7 @@
 
           content:'',
           result: '',
-          operateType: '',
+          operType: '',
           logSort:1,
           logDesc:1,
         };