fix: 合并冲突

src/fvcomponents/fvTable/index.vue

@@ -80,7 +80,7 @@
         </template>
       </el-table>
       <!-- 分页 -->
-      <fvPagination 
+      <fvPagination
         v-if="pagination"
         :current-page="localData.query.pageNum"
         :page-size="localData.query.pageSize"
@@ -269,7 +269,7 @@ defineExpose({ refresh, updateLoading, getQuery, tableInstance })
 onMounted(() => {
   getList()
 })
- 
+
 </script>
 
 <style lang="scss" scoped>
@@ -290,4 +290,4 @@ onMounted(() => {
   justify-content: space-between;
   align-content: center;
 }
-</style>
+</style>