Merge branch 'ts' into dev

# Conflicts:
#	package.json
#	src/layout/components/TagsView/index.vue

src/views/system/dept/index.vue

@@ -232,7 +232,7 @@ const handleAdd = (row?: DeptVO) => {
             nextTick(() => {
                 reset();
                 if (row && row.deptId) {
-                    form.value.parentId = row?.parentId;
+                    form.value.parentId = row?.deptId;
                 }
             })
         }

src/views/system/role/authUser.vue

@@ -63,7 +63,7 @@
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="getList"
       />
       <select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
     </el-card>

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>
 

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>