Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm

# Conflicts: # src/views/bpm/processInstance/detail/index_new.vue
2025-07-16 20:05:07 +08:00 · 2024-10-12 19:42:43 +08:00
parent 33f3bc0567 4342c3ee05
commit 6b06f320b9
8 changed files with 515 additions and 193 deletions
--- a/src/api/bpm/processInstance/index.ts
+++ b/src/api/bpm/processInstance/index.ts
@ -46,7 +46,7 @@ export type ApprovalNodeInfo = {
  status: number
  startTime?: Date
  endTime?: Date
-  candidateUserList?: User[]
+  candidateUsers?: User[]
  tasks: ApprovalTaskInfo[]
 }