Merge branch 'ts' into dev

# Conflicts: # package.json # src/layout/components/TagsView/index.vue
2023-05-06 09:25:05 +08:00
parent 7cfaeb5531 9b6cd8b047
commit bf4a8543ca
23 changed files with 239 additions and 164 deletions
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@ -95,7 +95,7 @@
        v-model:total="total"
        v-model:page="queryParams.pageNum"
        v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="getList"
      />
    </el-card>