Merge remote-tracking branch 'origin/master'

jiangping

2024-09-23 ce4a7783e6def97a27b7535483f3cb96a8d07e48

 admin/src/components/common/Pagination.vue

@@ -1,8 +1,8 @@
<template>
  <div class="table-pagination">
    <el-pagination
      :current-page="pagination.pageIndex"
      :page-sizes="[10, 20, 30, 40]"
      :current-page="pagination.pageIndex || pagination.page"
      :page-sizes="pagination.pageSizes||[10, 20, 30, 40]"
      :page-size="pagination.pageSize"
      layout="total, sizes, prev, pager, next, jumper"
      :total="pagination.total"