resolve: 解决合并冲突

web/src/api/system/user/index.ts

@@ -209,6 +209,19 @@ export const deptTreeSelect = (): AxiosPromise<DeptTreeVO[]> => {
   });
 };
 
+/** 获取具有指定权限的用户列表 */
+export function listUsersByPermission(permission: string, tenantId?: string): AxiosPromise<UserVO[]> {
+  return request({
+    url: '/system/user/list-by-permission',
+    method: 'get',
+    params: {
+      permission,
+      tenantId
+    }
+  });
+}
+
+
 export default {
   listUser,
   getUser,
@@ -225,5 +238,6 @@ export default {
   getAuthRole,
   updateAuthRole,
   deptTreeSelect,
-  listUserByDeptId
+  listUserByDeptId,
+  listUsersByPermission
 };