Merge remote-tracking branch 'origin/master' into yxh01

yxh

2023-06-15 1b555a0ab0527478cdf2b0c31c0ea8aea70f8adc

 src/components/Pagination/index.vue

文件名从 ruoyi-ui/src/components/Pagination/index.vue 修改
@@ -1,3 +1,5 @@

<!-- 搴曢儴鍒嗛〉缁勪欢灏佽 -->
<template>
  <div :class="{'hidden':hidden}" class="pagination-container">
    <el-pagination
@@ -16,6 +18,7 @@
</template>

<script>
// 寰呭畾
import { scrollTo } from '@/utils/scroll-to'

export default {