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

LiuHao

2023-05-05 2885d7e31c4a78a5048124d8f67068b6ade12d1d

 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>;