Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

 Conflicts:

	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

ruoyi-ui/src/components/Pagination/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div :class="{'hidden':hidden}" class="pagination-container">
     <el-pagination
+      v-if="pageShow"
       :background="background"
       :current-page.sync="currentPage"
       :page-size.sync="pageSize"
@@ -61,6 +62,11 @@ export default {
       default: false
     }
   },
+  data() {
+    return {
+      pageShow: true
+    };
+  },
   computed: {
     currentPage: {
       get() {
@@ -81,6 +87,12 @@ export default {
   },
   methods: {
     handleSizeChange(val) {
+      if (this.currentPage * val > this.total) {
+        this.pageShow = false;
+        this.$nextTick(() => {
+          this.pageShow = true
+        })
+      }
       this.$emit('pagination', { page: this.currentPage, limit: val })
       if (this.autoScroll) {
         scrollTo(0, 800)