Merge remote-tracking branch 'origin/master'

Tcsm

2023-09-25 7bee61be8fba5c23999dc9e826e6af9de98db469

 ruoyi-ui/src/views/genealogy/index.vue

@@ -195,7 +195,6 @@
    </el-table>

    <pagination
      v-show="total!=0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"