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/user/index.vue
+++ b/src/views/system/user/index.vue
@ -146,7 +146,7 @@
            :total="total"
            v-model:page="queryParams.pageNum"
            v-model:limit="queryParams.pageSize"
-            @pagination="handleQuery"
+            @pagination="getList"
          />
        </el-card>
      </el-col>