Merge remote-tracking branch 'origin/master'

chenyao

2026-04-09 7551626c3393b6943793e80180930bfb97319767

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/api/system/user.js

@@ -1,6 +1,6 @@
import request from '@/axios';

export const getList = (current, size,sysType,params, deptId) => {
export const getList = (current, size,params, deptId) => {
  return request({
    url: '/blade-system/user/page',
    method: 'get',
@@ -8,7 +8,6 @@
      ...params,
      current,
      size,
      sysType,
      deptId,
    },
  });

 applications/drone-command/src/views/permissionManage/permissionUser/index.vue

@@ -135,8 +135,8 @@
        const res = await getUserList(
            searchParams.value.current,
            searchParams.value.size,
            searchParams.value.sysType,
            {
                sysType: searchParams.value.sysType,
                account: searchParams.value.account,
                realName: searchParams.value.realName,
            },