Merge remote-tracking branch 'origin/dev' into dev

LiuHao

2023-06-06 06bc04c04c120b2e89a661c36b6316b99c1ad6ea

 src/api/system/role/types.ts

@@ -45,7 +45,7 @@
  menuCheckStrictly: boolean;
  deptCheckStrictly: boolean;
  remark: string;
  dataScope?: number;
  dataScope?: string;
  roleId: string | undefined;
  menuIds: Array<string | number>;
  deptIds: Array<string | number>;