Merge branch 'develop' into feature/mzl_dev

This commit is contained in:
mzl
2025-09-10 13:39:06 +08:00
parent 7a8c0d6cc3
commit 17efdf01df
10 changed files with 760 additions and 765 deletions
@@ -46,7 +46,9 @@ class ApprovalRecordsController extends BaseController
'step_index' => $record['step_index'],
'action' => $record['action'],
'status' => SysDictItem::where('item_value', $record['status'])->where('status', 1)->value('item_label'),
'action_desc' => SysDictItem::where('item_value', $record['action'])->where('status', 1)->value('item_label'),
'status' => $record['status'],
'status_desc' => SysDictItem::where('item_value', $record['status'])->where('status', 1)->value('item_label'),
'comment' => $record['comment'],
'approved_at' => $record['approved_at'],